]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'leds/for-mm'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 02:58:14 +0000 (13:58 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 02:58:14 +0000 (13:58 +1100)
commit160b14ef721fe0e9e3b7aa093fc1c6079b9833e4
treeec9c75b605997b09eebe79484098b42cfc65753b
parentcec4212a8ce03db5d0ec43ca037c114fae754b2a
parenta4b4433c511cf4361bb0afabba69e16632002d32
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig