diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-30 18:44:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-30 18:44:44 -0800 |
| commit | aa2e7100e38880db7907cb2b7ec6267b2b243771 (patch) | |
| tree | 67f9d2479365398c07833d3fc4f794861f7da5b1 /MAINTAINERS | |
| parent | 2def2ef2ae5f3990aabdbe8a755911902707d268 (diff) | |
| parent | 7c094fd698de2f333fa39b6da213f880d40b9bfe (diff) | |
| download | linux-aa2e7100e38880db7907cb2b7ec6267b2b243771.tar.gz | |
Merge branch 'akpm' (patches from Andrew Morton)
Merge misc fixes from Andrew Morton:
"A few hotfixes and various leftovers which were awaiting other merges.
Mainly movement of zram into mm/"
* emailed patches fron Andrew Morton <akpm@linux-foundation.org>: (25 commits)
memcg: fix mutex not unlocked on memcg_create_kmem_cache fail path
Documentation/filesystems/vfs.txt: update file_operations documentation
mm, oom: base root bonus on current usage
mm: don't lose the SOFT_DIRTY flag on mprotect
mm/slub.c: fix page->_count corruption (again)
mm/mempolicy.c: fix mempolicy printing in numa_maps
zram: remove zram->lock in read path and change it with mutex
zram: remove workqueue for freeing removed pending slot
zram: introduce zram->tb_lock
zram: use atomic operation for stat
zram: remove unnecessary free
zram: delay pending free request in read path
zram: fix race between reset and flushing pending work
zsmalloc: add maintainers
zram: add zram maintainers
zsmalloc: add copyright
zram: add copyright
zram: remove old private project comment
zram: promote zram from staging
zsmalloc: move it under mm
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a31a6e3e199f..b5795f031b3e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9740,11 +9740,27 @@ T: Mercurial http://linuxtv.org/hg/v4l-dvb S: Odd Fixes F: drivers/media/pci/zoran/ +ZRAM COMPRESSED RAM BLOCK DEVICE DRVIER +M: Minchan Kim <minchan@kernel.org> +M: Nitin Gupta <ngupta@vflare.org> +L: linux-kernel@vger.kernel.org +S: Maintained +F: drivers/block/zram/ +F: Documentation/blockdev/zram.txt + ZS DECSTATION Z85C30 SERIAL DRIVER M: "Maciej W. Rozycki" <macro@linux-mips.org> S: Maintained F: drivers/tty/serial/zs.* +ZSMALLOC COMPRESSED SLAB MEMORY ALLOCATOR +M: Minchan Kim <minchan@kernel.org> +M: Nitin Gupta <ngupta@vflare.org> +L: linux-mm@kvack.org +S: Maintained +F: mm/zsmalloc.c +F: include/linux/zsmalloc.h + ZSWAP COMPRESSED SWAP CACHING M: Seth Jennings <sjenning@linux.vnet.ibm.com> L: linux-mm@kvack.org |