]> 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>
Thu, 27 Sep 2012 05:29:59 +0000 (15:29 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 27 Sep 2012 05:29:59 +0000 (15:29 +1000)
commit9f7edda7a34ba99ee3e4bf82710255320932fed1
tree282998b32ea3774a3892acaad0a3bea958b14e24
parent35431a2000374420693d3f0d78811b4ddc0c7f28
parent5dc2db05f2f690d71d95979b14cca50ab8e49f40
Merge remote-tracking branch 'char-misc/char-misc-next'

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