]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'pm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 23 Nov 2011 01:20:48 +0000 (12:20 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 23 Nov 2011 01:20:48 +0000 (12:20 +1100)
1  2 
kernel/cpu.c

diff --cc kernel/cpu.c
Simple merge