From: Tony Lindgren <tony@atomide.com>
Date: Fri, 24 Sep 2010 23:12:55 +0000 (-0700)
Subject: Merge cbus
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fd3fb1aada27f5157ca35566fb8a1a05ea6c9a6;p=pandora-kernel.git

Merge cbus

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

3fd3fb1aada27f5157ca35566fb8a1a05ea6c9a6
Reading git-diff-tree failed