]> 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>
Mon, 20 Aug 2012 06:27:58 +0000 (16:27 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 20 Aug 2012 06:27:58 +0000 (16:27 +1000)
commit5bdf46074c66d70647c10149ba0fb07a18262269
tree88b5f7ca0b75a66e0e5145921fc1573c15fce7f3
parentf21e0d58bd91a715d7b1f67e93da802956e3f127
parent877cdf3949cc67d00677a1dfb913001f324ac40d
Merge remote-tracking branch 'char-misc/char-misc-next'

Conflicts:
drivers/misc/mei/interrupt.c