From: Tony Lindgren <tony@atomide.com>
Date: Thu, 24 Feb 2011 23:20:57 +0000 (-0800)
Subject: Merge branch 'omap-for-linus' into cbus
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f0f5f92f335e78acf1388e0cdd8e9960ab2e829;p=pandora-kernel.git

Merge branch 'omap-for-linus' into cbus

Conflicts:
	arch/arm/plat-omap/include/plat/irqs.h
---

5f0f5f92f335e78acf1388e0cdd8e9960ab2e829
Reading git-diff-tree failed