git.kernelconcepts.de Git - karo-tx-linux.git/commit

]> git.kernelconcepts.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a3c95b9 1ac9af7)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 3 Oct 2012 04:56:49 +0000 (14:56 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 3 Oct 2012 04:56:49 +0000 (14:56 +1000)
commit	1db2581de32a74e3803bf67cafc4353ea636f3a6
tree	4b6e5fa29bdb6d728e8732e68a429e1bb5ae2ac2	tree \| snapshot
parent	a3c95b95f37f66149c178bcc5f4585ada21f22cc	commit \| diff
parent	1ac9af79e28fe85b65cf22edd86fc2ebead518a4	commit \| diff

Merge remote-tracking branch 'pm/linux-next'

Conflicts:
arch/arm/mach-shmobile/include/mach/common.h

15 files changed:

arch/arm/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-ap4evb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-armadillo800eva.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-mackerel.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/include/mach/common.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/include/mach/r8a7779.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/pm-rmobile.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/pm-sh7372.c	diff1 \|	diff2 \|	blob \| history
drivers/base/platform.c	diff1 \|	diff2 \|	blob \| history
drivers/base/power/main.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq_conservative.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq_ondemand.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/pci-driver.c	diff1 \|	diff2 \|	blob \| history
include/linux/device.h	diff1 \|	diff2 \|	blob \| history
include/linux/pm.h	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules