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

Merge cbus

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

9ef6fdec8438f486106fb74915242c806054fd17
Reading git-diff-tree failed