From: Tony Lindgren <tony@atomide.com>
Date: Tue, 28 Sep 2010 00:18:30 +0000 (-0700)
Subject: Merge cbus
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a54298357a4f2d6877aa539a600e32e37494ee1;p=pandora-kernel.git

Merge cbus

Conflicts:
	arch/arm/mach-omap2/board-n8x0.c
---

7a54298357a4f2d6877aa539a600e32e37494ee1
Reading git-diff-tree failed