From: Arnd Bergmann <arnd@arndb.de>
Date: Sun, 30 Oct 2011 19:59:09 +0000 (+0100)
Subject: Merge branch 'pxa/devel' into next/devel2
X-Git-Tag: v3.2-rc1~39^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8bc83971cc20cae3c3b65c26a804f350d74960c;p=pandora-kernel.git

Merge branch 'pxa/devel' into next/devel2

Conflicts:
	arch/arm/mach-s3c2416/s3c2416.c
---

b8bc83971cc20cae3c3b65c26a804f350d74960c
Reading git-diff-tree failed