]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'apm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Sep 2012 03:36:06 +0000 (13:36 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Sep 2012 03:36:06 +0000 (13:36 +1000)
1  2 
arch/x86/kernel/apm_32.c

Simple merge