From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 9 Sep 2011 03:50:29 +0000 (+1000)
Subject: Merge remote-tracking branch 'leds/for-mm'
X-Git-Tag: next-20110909~42
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fbb0a04cb1e197ae5a532c754f81bde54cf072e2;p=karo-tx-linux.git

Merge remote-tracking branch 'leds/for-mm'

Conflicts:
	drivers/leds/Kconfig
---

fbb0a04cb1e197ae5a532c754f81bde54cf072e2