]> 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, 6 Oct 2011 02:38:33 +0000 (13:38 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Oct 2011 02:38:33 +0000 (13:38 +1100)
commit91ae67a46c2b5c2a4fb7e9c4254783f6aebc3c2f
treef0fb30786d249cd65eb6efce68850fa7f5dfae73
parent40c3d32ecb77fe170fde51e60339ecab4693e0ca
parenta4b4433c511cf4361bb0afabba69e16632002d32
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig