]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'leds/for-mm'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 02:40:24 +0000 (13:40 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 02:40:24 +0000 (13:40 +1100)
commitd37b27c6db070704f7b22e85496239775b2d1e35
tree9bdfd41fe778ec57fb3b35a11b257cdd6b4157a0
parenta9767507339bb4321fda6736ed42d088ff516604
parenta4b4433c511cf4361bb0afabba69e16632002d32
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig