aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pv310/include/mach/map.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-10-18 17:34:47 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-10-18 17:34:47 -0400
commita0a55682b83fd5f012afadcf415b030d7424ae68 (patch)
tree97ad3cb7e3443f09fbe55f57d3c36994b20a8e52 /arch/arm/mach-s5pv310/include/mach/map.h
parent23beab76b490172a9ff3d52843e4d27a35b2a4c6 (diff)
parent865a4fae7793b80e2b8bca76e279d6dfecbeac17 (diff)
Merge branch 'hotplug' into devel
Conflicts: arch/arm/kernel/head-common.S
Diffstat (limited to 'arch/arm/mach-s5pv310/include/mach/map.h')
0 files changed, 0 insertions, 0 deletions