Merge branch 'next-gpio-update' into for-next

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

Mon, 25 Oct 2010 06:57:16 +0000 (15:57 +0900)

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

Mon, 25 Oct 2010 06:57:16 +0000 (15:57 +0900)
author Kukjin Kim <kgene.kim@samsung.com>
Mon, 25 Oct 2010 06:57:16 +0000 (15:57 +0900)
committer Kukjin Kim <kgene.kim@samsung.com>
Mon, 25 Oct 2010 06:57:16 +0000 (15:57 +0900)
diff --cc arch/arm/plat-samsung/include/plat/gpio-cfg.h
Simple merge
author	Kukjin Kim <kgene.kim@samsung.com>
	Mon, 25 Oct 2010 06:57:16 +0000 (15:57 +0900)
committer	Kukjin Kim <kgene.kim@samsung.com>
	Mon, 25 Oct 2010 06:57:16 +0000 (15:57 +0900)