]> 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, 25 Oct 2011 07:20:20 +0000 (18:20 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 25 Oct 2011 07:20:20 +0000 (18:20 +1100)
1  2 
drivers/char/apm-emulation.c

Simple merge