From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 19 Aug 2011 01:24:04 +0000 (+1000)
Subject: Merge remote-tracking branch 'leds/for-mm'
X-Git-Tag: next-20110819~32
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e9e1265fb2f60e7064f9cf017fcfba7e435bae8f;p=karo-tx-linux.git

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

Conflicts:
	drivers/leds/Kconfig
---

e9e1265fb2f60e7064f9cf017fcfba7e435bae8f