Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/xfs-vipt
commitf24407d2bde27a4eb75ce5e52069bf4f1ba0e8a5
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 27 Feb 2010 01:05:10 +0000 (26 17:05 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 27 Feb 2010 01:05:10 +0000 (26 17:05 -0800)
tree6ad6dbc0b3d394435615b5e53b7d2ab3bde4c354
parent654451748b779b28077d9058442d0f354251870d
parent73c77e2ccc14413c232c3e0b3aa43a0c4b72ec70
Merge git://git./linux/kernel/git/jejb/xfs-vipt

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/xfs-vipt:
  xfs: fix xfs to work with Virtually Indexed architectures
  sh: add mm API for DMA to vmalloc/vmap areas
  arm: add mm API for DMA to vmalloc/vmap areas
  parisc: add mm API for DMA to vmalloc/vmap areas
  mm: add coherence API for DMA to vmalloc/vmap areas
arch/arm/include/asm/cacheflush.h
include/linux/highmem.h