Merge branch 'next-samsung-devel' into for-next

author Kukjin Kim <kgene.kim@samsung.com>

Thu, 8 Dec 2011 04:17:08 +0000 (13:17 +0900)

committer Kukjin Kim <kgene.kim@samsung.com>

Thu, 8 Dec 2011 04:17:08 +0000 (13:17 +0900)
author Kukjin Kim <kgene.kim@samsung.com>
Thu, 8 Dec 2011 04:17:08 +0000 (13:17 +0900)
committer Kukjin Kim <kgene.kim@samsung.com>
Thu, 8 Dec 2011 04:17:08 +0000 (13:17 +0900)
diff --cc arch/arm/mach-s3c64xx/dev-spi.c
Simple merge
diff --cc arch/arm/mach-s3c64xx/mach-crag6410-module.c
Simple merge
diff --cc drivers/tty/serial/Kconfig
Simple merge
author	Kukjin Kim <kgene.kim@samsung.com>
	Thu, 8 Dec 2011 04:17:08 +0000 (13:17 +0900)
committer	Kukjin Kim <kgene.kim@samsung.com>
	Thu, 8 Dec 2011 04:17:08 +0000 (13:17 +0900)
		1	2
arch/arm/mach-s3c64xx/dev-spi.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-crag6410-module.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history