From: Tony Lindgren <tony@atomide.com>
Date: Fri, 11 Mar 2011 17:20:03 +0000 (-0800)
Subject: Merge branch 'integration-2.6.39-for-tony' of git://git.pwsan.com/linux-integration... 
X-Git-Tag: v2.6.39-rc1~432^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2358a7bc35e388978fc2f7f6b071a0fd27d78c1;p=pandora-kernel.git

Merge branch 'integration-2.6.39-for-tony' of git://git.pwsan.com/linux-integration into omap-for-linus

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

a2358a7bc35e388978fc2f7f6b071a0fd27d78c1
Reading git-diff-tree failed