]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'leds/for-mm'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Sep 2011 03:50:29 +0000 (13:50 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Sep 2011 03:50:29 +0000 (13:50 +1000)
commitfbb0a04cb1e197ae5a532c754f81bde54cf072e2
tree7a5118b0e15046b53c198fcad4f985118b8a1cff
parentd15dfb8ccdc6f907c4aa674d554d42b354746b13
parenta4b4433c511cf4361bb0afabba69e16632002d32
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig