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: NArnd Bergmann <arnd@arndb.de>