]> 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: 213cfb0 a4b4433)
Merge remote-tracking branch 'leds/for-mm'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Aug 2011 04:08:50 +0000 (14:08 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Aug 2011 04:08:50 +0000 (14:08 +1000)
Conflicts:
drivers/leds/Kconfig


Trivial merge
Linux kernel for KaRo TX COM modules