From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 5 Sep 2011 05:00:58 +0000 (+1000)
Subject: Merge remote-tracking branch 'leds/for-mm'
X-Git-Tag: next-20110905~42
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=51899f1bde1423e88e8a67bc175bf04fedac8db5;p=karo-tx-linux.git

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

Conflicts:
	drivers/leds/Kconfig
---

51899f1bde1423e88e8a67bc175bf04fedac8db5