]> git.ipfire.org Git - people/ms/linux.git/commitdiff
projects / people / ms / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6544517 73c77e2)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/xfs-vipt
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 27 Feb 2010 01:05:10 +0000 (17:05 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 27 Feb 2010 01:05:10 +0000 (17:05 -0800)
* 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

1  2 
arch/arm/include/asm/cacheflush.h patch | diff1 | diff2 | blob | history
include/linux/highmem.h patch | diff1 | diff2 | blob | history

diff --cc arch/arm/include/asm/cacheflush.h
Simple merge
diff --cc include/linux/highmem.h
Simple merge
Michael's Linux tree.