From: Tony Lindgren <tony@atomide.com>
Date: Fri, 20 Jan 2012 13:31:52 +0000 (-0800)
Subject: Merge branch 'omap1-part2' into omap1
X-Git-Tag: v3.4-rc1~88^2~10^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=967809bd7faf71ddc29c8081e0f21db8b201a0f4;p=pandora-kernel.git

Merge branch 'omap1-part2' into omap1

Conflicts:
	drivers/leds/leds-ams-delta.c
---

967809bd7faf71ddc29c8081e0f21db8b201a0f4
Reading git-diff-tree failed