Merge Linus' tree to be be to apply submitted patches to newer code than

[mirror_ubuntu-artful-kernel.git] / mm / zswap.c

diff --git a/mm/zswap.c b/mm/zswap.c
index ea064c1a09ba79003a5ed5e8990d1ce44f2e6122..c1543061a192df68c0620079635f77989b8ab89b 100644 (file)
--- a/mm/zswap.c
+++ b/mm/zswap.c
@@ -951,5 +951,5 @@ error:
 late_initcall(init_zswap);
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Seth Jennings <sjenning@linux.vnet.ibm.com>");
+MODULE_AUTHOR("Seth Jennings <sjennings@variantweb.net>");
 MODULE_DESCRIPTION("Compressed cache for swap pages");