summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-03-27 12:29:31 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-03-27 12:29:31 +0200
commit4ba21e868f4b6e2ce5432055e206edadc6319533 (patch)
tree0d06d66d00c091ebd2abc88cfcf9332b6bc08f18 /arch/arm
parentARM: cache-l2x0.c: consistently use u32 (diff)
parentARM: pgtable: get rid of TOP_PTE() (diff)
parentARM: fix Kconfig warning for HAVE_BPF_JIT (diff)
downloadlinux-4ba21e868f4b6e2ce5432055e206edadc6319533.tar.xz
linux-4ba21e868f4b6e2ce5432055e206edadc6319533.zip
Merge branches 'l2', 'pgt2' and 'misc' into for-linus