From: Tony Lindgren <tony@atomide.com>
Date: Mon, 1 Mar 2010 22:19:05 +0000 (-0800)
Subject: Merge with mainline to remove plat-omap/Kconfig conflict
X-Git-Tag: v2.6.34-rc1~230^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d702d12167a2c05a346f49aac7a311d597762495;p=pandora-kernel.git

Merge ... mainline to remove plat-omap/Kconfig conflict

Conflicts:
	arch/arm/plat-omap/Kconfig
---

d702d12167a2c05a346f49aac7a311d597762495
Reading git-diff-tree failed