From: Tony Lindgren <tony@atomide.com>
Date: Mon, 4 May 2009 22:05:05 +0000 (-0700)
Subject: Merge current mainline tree into linux-omap tree
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~158
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3ffa5571d1535c0d0d565d8422f2b1b5729b45a;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:
	arch/arm/mach-omap2/board-omap3beagle.c
---

e3ffa5571d1535c0d0d565d8422f2b1b5729b45a
Reading git-diff-tree failed