diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 12:56:44 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 12:56:44 (GMT) |
| commit | 4045407fd7740642b18bc802e8bab064e79a61e5 (patch) | |
| tree | 9412a38886bfad562bc5897c6e4c23bb88703204 /arch/arm/mach-s5pc100/setup-ide.c | |
| parent | 59136ef3c596606d3eef920dc3e0fdfa2ce52c6f (diff) | |
| parent | 4c5f830c4c9d4f19c1eef356c0cd322b46d695c9 (diff) | |
| download | linux-fsl-qoriq-4045407fd7740642b18bc802e8bab064e79a61e5.tar.xz | |
Merge branch 'restart-cleanup' into restart
Conflicts:
arch/arm/kernel/setup.c
Diffstat (limited to 'arch/arm/mach-s5pc100/setup-ide.c')
0 files changed, 0 insertions, 0 deletions