From: Tony Lindgren <tony@atomide.com>
Date: Tue, 22 Feb 2011 19:16:30 +0000 (-0800)
Subject: Merge for-next omap-testing cbus
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79e3624a5fb06f17db39420ea6ca0069816f5b10;p=pandora-kernel.git

Merge for-next omap-testing cbus

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

79e3624a5fb06f17db39420ea6ca0069816f5b10
Reading git-diff-tree failed