From: Kukjin Kim <kgene.kim@samsung.com>
Date: Fri, 6 Aug 2010 12:49:18 +0000 (+0900)
Subject: Merge branch 'next-samsung' into for-next
X-Git-Tag: v2.6.36-rc1~102^2^2^2^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d61bd77ff1e7c7a0a381c6e656dbc07b37510f37;p=pandora-kernel.git

Merge branch 'next-samsung' into for-next

Conflicts:
	arch/arm/mach-s5p6440/Kconfig
	arch/arm/mach-s5p6442/Kconfig
	arch/arm/mach-s5pc100/Kconfig
	arch/arm/mach-s5pv210/Kconfig
	arch/arm/mach-s5pv210/cpu.c
	arch/arm/plat-samsung/include/plat/sdhci.h
---

d61bd77ff1e7c7a0a381c6e656dbc07b37510f37
Reading git-diff-tree failed