]> 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, 14 Oct 2011 02:50:39 +0000 (13:50 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 02:50:39 +0000 (13:50 +1100)
commit1d2f664541bf29e65a715d1986e2f5ef779b05ca
treecf79252505ff8c2262c29d32a6ca92858238c6f4
parent9f76be659584814b4c00641eb4879e41b77feafb
parenta4b4433c511cf4361bb0afabba69e16632002d32
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig