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

Merge branch 'stericsson/cleanup' into next/timer

The timer and cleanup branches from stericsson conflict,
so I'm merging them here.

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

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

eed1e576507b52e03e549e0c9e0c747978122403
Reading git-diff-tree failed