]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'pm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 18 Nov 2011 02:27:47 +0000 (13:27 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 18 Nov 2011 02:27:47 +0000 (13:27 +1100)
1  2 
arch/arm/mach-shmobile/pm-sh7372.c
include/linux/device.h
kernel/cpu.c

Simple merge
Simple merge
diff --cc kernel/cpu.c
Simple merge