]> bbs.cooldavid.org Git - net-next-2.6.git/commit - arch/arm/mach-s5pc100/Kconfig
Merge branch 'next-samsung' into for-next
authorKukjin Kim <kgene.kim@samsung.com>
Fri, 6 Aug 2010 12:49:18 +0000 (21:49 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Fri, 6 Aug 2010 12:49:18 +0000 (21:49 +0900)
commitd61bd77ff1e7c7a0a381c6e656dbc07b37510f37
tree838f7b1c4d931814fbbc30643bb423f409e6daba
parentf2b7e3c54a304677a1142829fb5913595885379f
parent1c739c7f374f77c5a355273c0c1d9345ed08c0ce
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
arch/arm/Kconfig
arch/arm/mach-s5p6440/Kconfig
arch/arm/mach-s5pc100/Kconfig
arch/arm/mach-s5pc100/include/mach/map.h
arch/arm/mach-s5pv210/Kconfig
arch/arm/mach-s5pv210/cpu.c
arch/arm/mach-s5pv210/include/mach/map.h
arch/arm/mach-s5pv210/setup-sdhci-gpio.c
arch/arm/plat-s5p/Makefile
arch/arm/plat-samsung/Makefile
arch/arm/plat-samsung/include/plat/sdhci.h