From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 12 Oct 2011 02:58:14 +0000 (+1100)
Subject: Merge remote-tracking branch 'leds/for-mm'
X-Git-Tag: next-20111012~46
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=160b14ef721fe0e9e3b7aa093fc1c6079b9833e4;p=karo-tx-linux.git

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

Conflicts:
	drivers/leds/Kconfig
---

160b14ef721fe0e9e3b7aa093fc1c6079b9833e4