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

Merge cbus

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

cfe23e946704514cb2edf56642c8001c0e9c515d
Reading git-diff-tree failed