diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-12-12 13:25:16 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-12-12 13:25:16 +1100 |
| commit | 171c69846b9c9c30081e3165c474c6b42d8e3726 (patch) | |
| tree | acbe54e255538beca8c1258bc5de1fe5d3ba4c46 /mm/zswap.c | |
| parent | 3f43b18abbc10c6127922bd34f3f768c379a0a68 (diff) | |
| parent | 078014dd36989c66378dfe80066c3f8a1f6952e8 (diff) | |
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
drivers/pci/pci-driver.c
Diffstat (limited to 'mm/zswap.c')
| -rw-r--r-- | mm/zswap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/zswap.c b/mm/zswap.c index ea064c1a09ba..c1543061a192 100644 --- 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"); |