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

Merge cbus

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

78e1d6a345653385346c3c3925dab206d7690f4f
Reading git-diff-tree failed