From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 9 Jan 2012 16:14:07 +0000 (+0000)
Subject: Merge branch 'samsung/cleanup' into samsung/driver
X-Git-Tag: v3.3-rc1~138^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=142f2101a86ade2d6c9dfbedf82e1b5b31c8fce6;p=pandora-kernel.git

Merge branch 'samsung/cleanup' into samsung/driver

Conflicts:
	arch/arm/mach-s5p64x0/cpu.c -> common.c

More changes to a file that got moved into common.c,
see previous conflict resolutions.

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

142f2101a86ade2d6c9dfbedf82e1b5b31c8fce6
Reading git-diff-tree failed