]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'apm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Apr 2012 02:10:54 +0000 (12:10 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Apr 2012 02:10:54 +0000 (12:10 +1000)
1  2 
drivers/char/apm-emulation.c

Simple merge