summaryrefslogtreecommitdiff
path: root/mm/highmem.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-03-16 20:25:17 (GMT)
committerArnd Bergmann <arnd@arndb.de>2012-03-16 20:25:17 (GMT)
commita94c7b0a8f31a8bcf3b136d469f7eb6b6b57bb78 (patch)
treecac33ce0abaaeb56b6e08a396cb7ff4e3e3b8f61 /mm/highmem.c
parentd4ef467aea0fdcd5e75a4bbfaf97e579bbe532f3 (diff)
parent9652e8bd16e73f7a34cabf1ab114aaa5c97db660 (diff)
downloadlinux-a94c7b0a8f31a8bcf3b136d469f7eb6b6b57bb78.tar.xz
Merge branch 'spear/dt' into next/dt2
* spear/dt: ARM: SPEAr600: Add device-tree support to SPEAr600 boards (update to v3.3-rc7) Conflicts: arch/arm/mach-spear6xx/spear6xx.c arch/arm/mach-vexpress/Kconfig The conflicts are between the previous contents of the next/dt2 branch and upstream changes from v3.3-rc7. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'mm/highmem.c')
0 files changed, 0 insertions, 0 deletions