From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 3 Jan 2012 20:27:45 +0000 (+0000)
Subject: Merge branch 'v3.2-rc7' into next/pm
X-Git-Tag: v3.3-rc1~137^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d3cb0ffdd0c8987dc17a2ef4529b246198ceb72;p=pandora-kernel.git

Merge branch 'v3.2-rc7' into next/pm

Conflicts:
	arch/arm/kernel/setup.c
	arch/arm/mach-shmobile/board-kota2.c
---

5d3cb0ffdd0c8987dc17a2ef4529b246198ceb72
Reading git-diff-tree failed