From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 21 Sep 2011 02:36:40 +0000 (+1000)
Subject: Merge remote-tracking branch 'leds/for-mm'
X-Git-Tag: next-20110921~43
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=83df6f1d913e22899d97e0db700fc6b76d399bb6;p=karo-tx-linux.git

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

Conflicts:
	drivers/leds/Kconfig
---

83df6f1d913e22899d97e0db700fc6b76d399bb6