From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 2 Nov 2011 01:46:10 +0000 (+0100)
Subject: Merge branch 'highbank/soc' into next/soc
X-Git-Tag: v3.2-rc1~88^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=884897e6a10a86de0e611a76f4bf3fd0068a672c;p=pandora-kernel.git

Merge branch 'highbank/soc' into next/soc

Conflicts:
	arch/arm/mach-mxs/include/mach/gpio.h
	arch/arm/mach-omap2/board-generic.c
	arch/arm/plat-mxc/include/mach/gpio.h
---

884897e6a10a86de0e611a76f4bf3fd0068a672c
Reading git-diff-tree failed