From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 4 Oct 2011 03:22:55 +0000 (+1100)
Subject: Merge remote-tracking branch 'leds/for-mm'
X-Git-Tag: next-20111004~44
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c7dcb997ebad4aaeec20e94ce13671a303a26cba;p=karo-tx-linux.git

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

Conflicts:
	drivers/leds/Kconfig
---

c7dcb997ebad4aaeec20e94ce13671a303a26cba