| commit | d61bd77ff1e7c7a0a381c6e656dbc07b37510f37 | [log] [tgz] |
|---|---|---|
| author | Kukjin Kim <kgene.kim@samsung.com> | Fri Aug 06 21:49:18 2010 +0900 |
| committer | Kukjin Kim <kgene.kim@samsung.com> | Fri Aug 06 21:49:18 2010 +0900 |
| tree | 838f7b1c4d931814fbbc30643bb423f409e6daba | |
| parent | f2b7e3c54a304677a1142829fb5913595885379f [diff] | |
| parent | 1c739c7f374f77c5a355273c0c1d9345ed08c0ce [diff] |
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