Merge branch 'next-samsung-clkdev-fix' into next-samsung-cleanup

author Kukjin Kim <[email protected]>

Wed, 20 Jul 2011 17:09:46 +0000 (02:09 +0900)

committer Kukjin Kim <[email protected]>

Wed, 20 Jul 2011 17:09:46 +0000 (02:09 +0900)
author Kukjin Kim <[email protected]>
Wed, 20 Jul 2011 17:09:46 +0000 (02:09 +0900)
committer Kukjin Kim <[email protected]>
Wed, 20 Jul 2011 17:09:46 +0000 (02:09 +0900)
diff --cc arch/arm/plat-s5p/s5p-time.c
Simple merge
diff --cc drivers/tty/serial/s5pv210.c
Simple merge
author	Kukjin Kim <[email protected]>
	Wed, 20 Jul 2011 17:09:46 +0000 (02:09 +0900)
committer	Kukjin Kim <[email protected]>
	Wed, 20 Jul 2011 17:09:46 +0000 (02:09 +0900)
		1	2
arch/arm/plat-s5p/s5p-time.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/s5pv210.c	patch \|	diff1 \|	diff2 \|	blob \| history