diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2014-11-12 15:11:15 +0100 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2014-11-12 15:11:15 +0100 |
| commit | 4c7912e9198b141b6cd85999d28b48cb5a037aa0 (patch) | |
| tree | 901b2bc822976f6092fd06c709876e96d78bd50d /fs/exofs/exofs.h | |
| parent | crypto: ux500/hash - Silence compiler warning for !CONFIG_PM (diff) | |
| parent | Linux 3.18-rc4 (diff) | |
| download | linux-4c7912e9198b141b6cd85999d28b48cb5a037aa0.tar.xz linux-4c7912e9198b141b6cd85999d28b48cb5a037aa0.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merging 3.18-rc4 in order to pick up the memzero_explicit helper.
Diffstat (limited to 'fs/exofs/exofs.h')
| -rw-r--r-- | fs/exofs/exofs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/exofs/exofs.h b/fs/exofs/exofs.h index fffe86fd7a42..ad9cac670a47 100644 --- a/fs/exofs/exofs.h +++ b/fs/exofs/exofs.h @@ -2,7 +2,7 @@ * Copyright (C) 2005, 2006 * Avishay Traeger (avishay@gmail.com) * Copyright (C) 2008, 2009 - * Boaz Harrosh <bharrosh@panasas.com> + * Boaz Harrosh <ooo@electrozaur.com> * * Copyrights for code taken from ext2: * Copyright (C) 1992, 1993, 1994, 1995 |