From: Arnd Bergmann <arnd@arndb.de>
Date: Sat, 8 Oct 2011 19:47:06 +0000 (+0200)
Subject: Merge branch 'stericsson/fixes' into next/cleanup
X-Git-Tag: v3.2-rc1~98^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3849a4c038a21075a0bc7eaf37f65a93976d10c;p=pandora-kernel.git

Merge branch 'stericsson/fixes' into next/cleanup

Conflicts:
	arch/arm/mach-ux500/cpu.c
---

a3849a4c038a21075a0bc7eaf37f65a93976d10c
Reading git-diff-tree failed