]> 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, 24 Aug 2012 06:08:02 +0000 (16:08 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 24 Aug 2012 06:08:02 +0000 (16:08 +1000)
commite8acf484001639b398953faff4f29f3abec47afb
tree7ad43080c6f88a59ee6c5d359a5b71c1388dc78a
parent41e993f14a6e5f68c1cdfc898362b7737d1857b2
parent877cdf3949cc67d00677a1dfb913001f324ac40d
Merge remote-tracking branch 'char-misc/char-misc-next'

Conflicts:
drivers/misc/mei/interrupt.c