From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 27 Sep 2011 03:15:04 +0000 (+1000)
Subject: Merge remote-tracking branch 'leds/for-mm'
X-Git-Tag: next-20110927~44
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f4a17ce0bc6d9e4acdb334c36b866a2d2643ffa9;p=karo-tx-linux.git

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

Conflicts:
	drivers/leds/Kconfig
---

f4a17ce0bc6d9e4acdb334c36b866a2d2643ffa9