From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 31 Oct 2011 22:25:41 +0000 (+0100)
Subject: Merge branch 'next/fixes' into next/cleanup
X-Git-Tag: v3.2-rc1~98^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e965b176341b78620f7404fd8b7f9a0d061f8a2;p=pandora-kernel.git

Merge branch 'next/fixes' into next/cleanup

Conflicts:
	arch/arm/mach-mxs/include/mach/gpio.h
	arch/arm/plat-mxc/include/mach/gpio.h
	drivers/video/omap/lcd_apollon.c
	drivers/video/omap/lcd_ldp.c
	drivers/video/omap/lcd_overo.c
---

3e965b176341b78620f7404fd8b7f9a0d061f8a2
Reading git-diff-tree failed