From: Tony Lindgren <tony@atomide.com>
Date: Tue, 15 Feb 2011 02:06:12 +0000 (-0800)
Subject: Merge branches 'devel-fixes', 'devel-cleanup', 'devel-board', 'devel-hwspinlock'... 
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ccecd1fedbb7102fb73ffcaadc54e901b295b3f;p=pandora-kernel.git

Merge branches 'devel-fixes', 'devel-cleanup', 'devel-board', 'devel-hwspinlock', 'devel-omap4' and 'devel-mcspi' into for-next

Conflicts:
	arch/arm/mach-omap2/devices.c
	drivers/spi/omap2_mcspi.c
---

5ccecd1fedbb7102fb73ffcaadc54e901b295b3f
Reading git-diff-tree failed