From: Tony Lindgren <tony@atomide.com>
Date: Wed, 16 Feb 2011 19:39:03 +0000 (-0800)
Subject: Merge branches 'devel-fixes', 'devel-hwspinlock', 'devel-omap4' and 'devel-mcspi... 
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7620e67bfae0c1c28ab86443b3283f40e6453fe;p=pandora-kernel.git

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

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

b7620e67bfae0c1c28ab86443b3283f40e6453fe
Reading git-diff-tree failed