From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 30 May 2011 02:18:42 +0000 (+1000)
Subject: Merge remote-tracking branch 'leds/for-mm'
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=914f21b98ae5fe74f671cfccf654956ca7ec2f74;p=pandora-kernel.git

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

Conflicts:
	drivers/leds/Kconfig
---

914f21b98ae5fe74f671cfccf654956ca7ec2f74
Reading git-diff-tree failed