From: Tony Lindgren <tony@atomide.com>
Date: Sat, 25 Sep 2010 00:14:58 +0000 (-0700)
Subject: Merge cbus
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f72f604ae2a0b4c06c1b8dee9938b55a77222ce;p=pandora-kernel.git

Merge cbus

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

6f72f604ae2a0b4c06c1b8dee9938b55a77222ce
Reading git-diff-tree failed