]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'char-misc/char-misc-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Sep 2012 04:31:16 +0000 (14:31 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Sep 2012 04:31:16 +0000 (14:31 +1000)
commit19d8eeed4433aff43e0044890b2afee6acb35c64
tree879877e4082c8eead5fdf644755952580646b278
parent7c79cc21233b49f984022599bd611a39192cf3a6
parent5dc2db05f2f690d71d95979b14cca50ab8e49f40
Merge remote-tracking branch 'char-misc/char-misc-next'

Conflicts:
drivers/char/pcmcia/synclink_cs.c
drivers/char/pcmcia/synclink_cs.c