diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 14:34:55 +0200 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 14:34:55 +0200 |
| commit | f2b7e3c54a304677a1142829fb5913595885379f (patch) | |
| tree | 1eb941524c7325672f947dab525d96228b362e20 /arch/arm/mach-s3c64xx/dev-spi.c | |
| parent | Merge branch 'next-s5pv310' into for-next (diff) | |
| parent | ARM: S5P: Add s5p_reset_hook() for perform reset using SWRESET on S5P SoCs (diff) | |
| download | linux-f2b7e3c54a304677a1142829fb5913595885379f.tar.xz linux-f2b7e3c54a304677a1142829fb5913595885379f.zip | |
Merge branch 'next-s5p' into for-next
Conflicts:
arch/arm/mach-s5pv210/mach-aquila.c
arch/arm/mach-s5pv210/mach-goni.c
Diffstat (limited to 'arch/arm/mach-s3c64xx/dev-spi.c')
0 files changed, 0 insertions, 0 deletions