From: Tony Lindgren <tony@atomide.com>
Date: Thu, 28 May 2009 22:44:54 +0000 (-0700)
Subject: Merge branch 'omap3-upstream' into for-next
X-Git-Tag: v2.6.31-rc1~344^2~23^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=970a724d9173526512ebd8be991a4cbe18b7aace;p=pandora-kernel.git

Merge branch 'omap3-upstream' into for-next

Conflicts:
	arch/arm/mach-omap2/serial.c
---

970a724d9173526512ebd8be991a4cbe18b7aace
Reading git-diff-tree failed