]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'apm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Sep 2012 04:24:18 +0000 (14:24 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Sep 2012 04:24:18 +0000 (14:24 +1000)
1  2 
arch/x86/kernel/apm_32.c

Simple merge