From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 29 Jul 2011 03:57:10 +0000 (+1000)
Subject: Merge remote-tracking branch 'leds/for-mm'
X-Git-Tag: next-20110729~32
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=07f32abe6c69b760afe3cbc44dd89e3b0db7f9cc;p=karo-tx-linux.git

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

Conflicts:
	drivers/leds/Kconfig
---

07f32abe6c69b760afe3cbc44dd89e3b0db7f9cc