From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Tue, 14 Oct 2008 21:24:42 +0000 (+0100)
Subject: Merge branch 'omap-all' into devel
X-Git-Tag: v2.6.28-rc1~293^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6825d2df55aa7d7341c715b577b73a6a03dc944;p=pandora-kernel.git

Merge branch 'omap-all' into devel

Conflicts:

	arch/arm/mach-omap2/gpmc.c
	arch/arm/mach-omap2/irq.c
---

b6825d2df55aa7d7341c715b577b73a6a03dc944
Reading git-diff-tree failed