summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ixp4xx/vulcan-pci.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-11-17 00:26:38 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2012-11-17 00:26:38 +0100
commit0cad3ff40486e341715cac3b5ef7b135fa0ba316 (patch)
tree937b8c6fc8b28f6e556212c9deee726799f1f783 /arch/arm/mach-ixp4xx/vulcan-pci.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
parentrevert "mm: fix-up zone present pages" (diff)
downloadlinux-0cad3ff40486e341715cac3b5ef7b135fa0ba316.tar.xz
linux-0cad3ff40486e341715cac3b5ef7b135fa0ba316.zip
Merge branch 'akpm' (Fixes from Andrew)
Merge misc fixes from Andrew Morton. * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (12 patches) revert "mm: fix-up zone present pages" tmpfs: change final i_blocks BUG to WARNING tmpfs: fix shmem_getpage_gfp() VM_BUG_ON mm: highmem: don't treat PKMAP_ADDR(LAST_PKMAP) as a highmem address mm: revert "mm: vmscan: scale number of pages reclaimed by reclaim/compaction based on failures" rapidio: fix kernel-doc warnings swapfile: fix name leak in swapoff memcg: fix hotplugged memory zone oops mips, arc: fix build failure memcg: oom: fix totalpages calculation for memory.swappiness==0 mm: fix build warning for uninitialized value mm: add anon_vma_lock to validate_mm()
Diffstat (limited to 'arch/arm/mach-ixp4xx/vulcan-pci.c')
0 files changed, 0 insertions, 0 deletions