Arnd Bergmann dcf7ec5ee6 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>
2012-01-09 16:16:29 +00:00
..
2011-06-01 19:29:39 -07:00
2011-08-26 17:26:35 -07:00
2011-03-31 11:26:23 -03:00
2011-05-26 17:12:33 -07:00
2011-05-26 17:12:33 -07:00