From: Tony Lindgren <tony@atomide.com>
Date: Tue, 14 Sep 2010 04:16:48 +0000 (-0700)
Subject: Merge cbus
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e64ef2313ae1cccc34545eb3db4237e26e00a85;p=pandora-kernel.git

Merge cbus

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

0e64ef2313ae1cccc34545eb3db4237e26e00a85
Reading git-diff-tree failed