diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 14:49:18 +0200 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 14:49:18 +0200 |
| commit | d61bd77ff1e7c7a0a381c6e656dbc07b37510f37 (patch) | |
| tree | 838f7b1c4d931814fbbc30643bb423f409e6daba /arch/arm/mach-s5p6442/Makefile | |
| parent | Merge branch 'next-s5p' into for-next (diff) | |
| parent | ARM: SAMSUNG: Fix on inclusion mach/gpio.h for Samsung SoCs (diff) | |
| download | linux-d61bd77ff1e7c7a0a381c6e656dbc07b37510f37.tar.xz linux-d61bd77ff1e7c7a0a381c6e656dbc07b37510f37.zip | |
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
Diffstat (limited to 'arch/arm/mach-s5p6442/Makefile')
0 files changed, 0 insertions, 0 deletions