Merge remote-tracking branch 'sudeep/juno_freq+idle' into juno-release
authorLiviu Dudau <Liviu.Dudau@arm.com>
Mon, 9 Jun 2014 13:15:01 +0000 (14:15 +0100)
committerLiviu Dudau <Liviu.Dudau@arm.com>
Mon, 9 Jun 2014 13:15:01 +0000 (14:15 +0100)
commit87ab3f30b0a2afaf4f1f5877e1c9719d9e096d9a
treec57579bb45e93c74a657deafba9f2a0a2ad17ab1
parentd598aa7e60e9226f7cc07f196b40afd3d21a0f83
parent93c335a9119e9f2f1139898ca8bc858ae3f3fa8b
Merge remote-tracking branch 'sudeep/juno_freq+idle' into juno-release

Conflicts:
arch/arm64/boot/dts/juno.dts
arch/arm64/configs/defconfig
arch/arm64/kernel/topology.c
drivers/clk/clk-scpi.c
drivers/cpufreq/scpi-cpufreq.c
drivers/input/serio/ambakmi.c
drivers/mailbox/arm_mhu.c
include/uapi/linux/audit.h
Documentation/DocBook/drm.tmpl
arch/arm64/boot/dts/juno.dts
arch/arm64/configs/defconfig
drivers/mailbox/arm_mhu.c
include/linux/sched.h
include/uapi/linux/audit.h
kernel/sched/core.c
kernel/sched/fair.c