From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 10 Aug 2011 00:35:46 +0000 (+1000)
Subject: Merge remote-tracking branch 'leds/for-mm'
X-Git-Tag: next-20110810~28
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=212f2ebecf18a839da0d4da98518aa78c13ab4f2;p=karo-tx-linux.git

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

Conflicts:
	drivers/leds/Kconfig
---

212f2ebecf18a839da0d4da98518aa78c13ab4f2