From: Tony Lindgren <tony@atomide.com>
Date: Fri, 27 Aug 2010 21:34:55 +0000 (-0700)
Subject: Merge cbus
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64baff90a50f58b0c9ec9518a549e3ad4ff40937;p=pandora-kernel.git

Merge cbus

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

64baff90a50f58b0c9ec9518a549e3ad4ff40937
Reading git-diff-tree failed