From: Tony Lindgren <tony@atomide.com>
Date: Tue, 24 Mar 2009 01:02:12 +0000 (-0700)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.29-omap1~10
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90e758af52ba803cba233fabee81176d99589f09;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
	arch/arm/plat-omap/include/mach/common.h
	arch/arm/plat-omap/include/mach/pm.h
---

90e758af52ba803cba233fabee81176d99589f09
Reading git-diff-tree failed