]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'apm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 27 Sep 2011 04:33:43 +0000 (14:33 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 27 Sep 2011 04:33:43 +0000 (14:33 +1000)
1  2 
drivers/char/apm-emulation.c

Simple merge