summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-10-25 09:19:29 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-10-25 09:19:29 +0200
commit06afb1a087d49ae0f676b2e5b9ffe5f4b3aba355 (patch)
tree5377c063ed07aed23eb9da0bfecfca307f8da0bc
parentLinux 3.1 (diff)
parentARM: include linux/highmem.h in uaccess functions (diff)
parentARM: 7116/1: debug: provide dummy default option for DEBUG_LL UART choice (diff)
parentARM: io: remove IO_SPACE_LIMIT from SA11x0 (diff)
parentARM: 7114/1: cache-l2x0: add resume entry for l2 in secure mode (diff)
parentARM: 7013/1: P2V: Remove ARM_PATCH_PHYS_VIRT_16BIT (diff)
parentARM: 7077/1: LPAE: Use a mask for physical addresses in page table entries (diff)
parentARM: smp: fix clipping of number of CPUs (diff)
downloadlinux-06afb1a087d49ae0f676b2e5b9ffe5f4b3aba355.tar.xz
linux-06afb1a087d49ae0f676b2e5b9ffe5f4b3aba355.zip
Merge branches 'arnd-randcfg-fixes', 'debug', 'io' (early part), 'l2x0', 'p2v', 'pgt' (early part) and 'smp' into for-linus