]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'apm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Sep 2011 03:21:30 +0000 (13:21 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Sep 2011 03:21:30 +0000 (13:21 +1000)
commitd5016f0edf07bc0a95437a9e0ab31903b17779e1
tree3fcfbfffcd30d4454a3eca4d620a84c937eaf12b
parent77410068b5a54786cc0537415a27ec1a44ead41c
parent1d927c3b5a4005a2ebc5356e7e1eec436e15fa22
Merge remote-tracking branch 'apm/for-next'
drivers/char/apm-emulation.c