Merge branch 'next/fixes-samsung' into for-next

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

Wed, 13 Feb 2013 01:03:41 +0000 (17:03 -0800)

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

Wed, 13 Feb 2013 01:03:41 +0000 (17:03 -0800)
author Kukjin Kim <kgene.kim@samsung.com>
Wed, 13 Feb 2013 01:03:41 +0000 (17:03 -0800)
committer Kukjin Kim <kgene.kim@samsung.com>
Wed, 13 Feb 2013 01:03:41 +0000 (17:03 -0800)
diff --cc arch/arm/mach-exynos/pm.c
Simple merge
diff --cc arch/arm/mach-s3c24xx/Kconfig
Simple merge
diff --cc arch/arm/mach-s3c24xx/mach-osiris.c
Simple merge
diff --cc arch/arm/mach-s3c24xx/pm-s3c2412.c
Simple merge
diff --cc arch/arm/mach-s3c24xx/pm-s3c2416.c
Simple merge
diff --cc arch/arm/mach-s3c64xx/pm.c
Simple merge
author	Kukjin Kim <kgene.kim@samsung.com>
	Wed, 13 Feb 2013 01:03:41 +0000 (17:03 -0800)
committer	Kukjin Kim <kgene.kim@samsung.com>
	Wed, 13 Feb 2013 01:03:41 +0000 (17:03 -0800)
		1	2
arch/arm/mach-exynos/pm.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c24xx/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c24xx/mach-osiris.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c24xx/pm-s3c2412.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c24xx/pm-s3c2416.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/pm.c	patch \|	diff1 \|	diff2 \|	blob \| history