Merge remote-tracking branch 'leds/for-mm'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 02:18:42 +0000 (12:18 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 02:18:42 +0000 (12:18 +1000)
Conflicts:
drivers/leds/Kconfig


Trivial merge