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

Merge branch 'samsung/driver' into next/drivers

Conflicts:
	arch/arm/mach-mxs/include/mach/common.h

Pull in previous samsung conflict merges and do a trivial
merge of an mxs double-add conflict.

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

dcf7ec5ee62a78123057a1e286c88ca739717409
Reading git-diff-tree failed