From: Tony Lindgren <tony@atomide.com>
Date: Thu, 10 Feb 2011 02:55:02 +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=1503fac238b6c49d8f126e1a81cf09c877ff95a7;p=pandora-kernel.git

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

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

1503fac238b6c49d8f126e1a81cf09c877ff95a7
Reading git-diff-tree failed