]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca5b857 8d59598)
Merge branch 'work.cramfs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Nov 2017 21:20:41 +0000 (13:20 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Nov 2017 21:20:41 +0000 (13:20 -0800)
Pull cramfs updates from Al Viro:
 "Nicolas Pitre's cramfs work"

* 'work.cramfs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  cramfs: rehabilitate it
  cramfs: add mmap support
  cramfs: implement uncompressed and arbitrary data block positioning
  cramfs: direct memory access support

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
include/uapi/linux/cramfs_fs.h patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc include/uapi/linux/cramfs_fs.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.