tree fa3f19434638a942ba66d236dde4d9aaadf8b370
parent 15db3e823c3246e3bd31fe454f5c8927eb85caf2
parent 142f2101a86ade2d6c9dfbedf82e1b5b31c8fce6
author Arnd Bergmann <arnd@arndb.de> 1326125789 +0000
committer Arnd Bergmann <arnd@arndb.de> 1326125789 +0000

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>