]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f21e0d5 877cdf3)
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)
Conflicts:
drivers/misc/mei/interrupt.c


Trivial merge
Linux kernel for KaRo TX COM modules