From: Tony Lindgren <tony@atomide.com>
Date: Fri, 18 Feb 2011 00:24:12 +0000 (-0800)
Subject: Merge for-next omap-testing cbus
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10e76616840d50b459378a9e0d7ffb9ae9662217;p=pandora-kernel.git

Merge for-next omap-testing cbus

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

10e76616840d50b459378a9e0d7ffb9ae9662217
Reading git-diff-tree failed