]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'leds/for-mm'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Aug 2011 02:00:07 +0000 (12:00 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Aug 2011 02:00:07 +0000 (12:00 +1000)
commit61722c9d6167e46e5c6acd55fad4b45c04289712
tree6d9437147dd8f5395b1cde416977d848838107dd
parent95d7121498dcc11af9d8632ef6e50ba1b14d9da0
parenta4b4433c511cf4361bb0afabba69e16632002d32
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig