From: Tony Lindgren <tony@atomide.com>
Date: Mon, 16 Aug 2010 06:27:43 +0000 (+0300)
Subject: Merge cbus
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c839664117ad24a406cb9220b626b6ab142a8ee;p=pandora-kernel.git

Merge cbus

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

2c839664117ad24a406cb9220b626b6ab142a8ee
Reading git-diff-tree failed