aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pc100
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-05-20 18:55:32 +0900
committerBen Dooks <ben-linux@fluff.org>2010-05-20 18:55:32 +0900
commitea5a4e209ddca984bbb5803b30d5e013e631f9ac (patch)
treea7f2cdb121fc44cfd7c382207104f867f93736c9 /arch/arm/mach-s5pc100
parentfac3d3555568de1755025a9609daf492dd548a59 (diff)
parenteff4c74da7944ba30feb47b51d1e9e940e6682ff (diff)
downloadkernel_samsung_smdk4412-ea5a4e209ddca984bbb5803b30d5e013e631f9ac.zip
kernel_samsung_smdk4412-ea5a4e209ddca984bbb5803b30d5e013e631f9ac.tar.gz
kernel_samsung_smdk4412-ea5a4e209ddca984bbb5803b30d5e013e631f9ac.tar.bz2
ARM: Merge for-2635-4/s5pv210-boards
Merge branch 'for-2635-4/s5pv210-boards' into for-2635-4/partial1 Conflicts: arch/arm/mach-s5pv210/include/mach/map.h
Diffstat (limited to 'arch/arm/mach-s5pc100')
0 files changed, 0 insertions, 0 deletions