Merge remote-tracking branch 'apm/for-next'
commitad700f7f1281592559bff0e354c454fae48b4e7c
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Aug 2011 03:02:41 +0000 (31 13:02 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Aug 2011 03:02:41 +0000 (31 13:02 +1000)
tree181c70881c6c7beb659cc16471a480f5636b88d4
parent74a0e751c972e2262d95ddf335b9f65fb7fc5d79
parent1d927c3b5a4005a2ebc5356e7e1eec436e15fa22
Merge remote-tracking branch 'apm/for-next'
drivers/char/apm-emulation.c