]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 01:14:35 +0000 (11:14 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 01:14:35 +0000 (11:14 +1000)
commitdabf25875906018f3a16000b58444d41ceb544bb
treeb52da85da6d977eb67b33ff55389518d45740bc1
parent8b6454af870fbb48444dfe94ef9f5d33b09ed4fd
parent0c932c3ecbba60bc5f9e08d579891cdbedfdd1c1
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
drivers/cpufreq/exynos-cpufreq.c
drivers/cpufreq/exynos-cpufreq.h
Documentation/kernel-parameters.txt
MAINTAINERS
drivers/clk/Makefile
drivers/cpufreq/Kconfig.arm
drivers/cpufreq/exynos-cpufreq.c
drivers/cpufreq/exynos-cpufreq.h
drivers/cpuidle/Kconfig.arm
drivers/cpuidle/Makefile
include/linux/cpuidle.h
include/linux/suspend.h