]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'apm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Sep 2011 06:50:36 +0000 (16:50 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Sep 2011 06:50:36 +0000 (16:50 +1000)
commit2b3486939e5f3b39f6be584fc3c83b0af11f7da7
tree4f0fdfafbda1a492d1ddc03de8abecca54d63c98
parenteef98f8d4bea53386b75c7ed6eefc4c1d7c2a29c
parent1d927c3b5a4005a2ebc5356e7e1eec436e15fa22
Merge remote-tracking branch 'apm/for-next'
drivers/char/apm-emulation.c