From: Tony Lindgren <tony@atomide.com>
Date: Mon, 30 Aug 2010 15:56:41 +0000 (-0700)
Subject: Merge cbus
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=844fe65ec50fb64ef7bd98cd5aa8329f1a9ef5e1;p=pandora-kernel.git

Merge cbus

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

844fe65ec50fb64ef7bd98cd5aa8329f1a9ef5e1
Reading git-diff-tree failed