From: Tony Lindgren <tony@atomide.com>
Date: Wed, 12 Aug 2009 17:04:59 +0000 (+0300)
Subject: Merge branch 'omap-upstream'
X-Git-Tag: v2.6.32-omap1~11^2^2~1^2^2^2^2^2~8^2^2~18^2~2^2^2~2^2^2^2^2~16^2^2~8^2^2~7^2~39
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4178c142dbf3326f5d88c486e68bbe109e65befa;p=pandora-kernel.git

Merge branch 'omap-upstream'

Conflicts:
	arch/arm/mach-omap2/Makefile
---

4178c142dbf3326f5d88c486e68bbe109e65befa
Reading git-diff-tree failed