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

Merge cbus

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

f4b1efe8f040babb625ad2bf98e4babc7da4da84
Reading git-diff-tree failed