]> 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, 23 Sep 2011 03:02:07 +0000 (13:02 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 03:02:07 +0000 (13:02 +1000)
commit47fd142fdc86d7e60f3a521ed3c039dcfa273365
tree1f4c8d1e6786cb6e4f93210f7d881a3027ed9840
parentb25b61e5a28ca7a746474ae57e7c04c0783515f7
parenta4b4433c511cf4361bb0afabba69e16632002d32
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig