From: Tony Lindgren <tony@atomide.com>
Date: Mon, 27 Sep 2010 20:23:47 +0000 (-0700)
Subject: Merge cbus
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c3722de3d21d0dcdbc7a203e22cac0fe709399d;p=pandora-kernel.git

Merge cbus

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

6c3722de3d21d0dcdbc7a203e22cac0fe709399d
Reading git-diff-tree failed