From: Tony Lindgren <tony@atomide.com>
Date: Wed, 10 Jun 2009 10:19:13 +0000 (+0300)
Subject: Merge branch 'for-next-2.6.30'
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~88
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69fec489a840c98c01c12f92825d0163bb324104;p=pandora-kernel.git

Merge branch 'for-next-2.6.30'

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

69fec489a840c98c01c12f92825d0163bb324104
Reading git-diff-tree failed