diff options
author | Linus Torvalds | 2014-10-21 21:53:45 +0200 |
---|---|---|
committer | Linus Torvalds | 2014-10-21 21:53:45 +0200 |
commit | 848a552893ff1fe071c57231edcd179cf84ec4f8 (patch) | |
tree | 720c74e623ead59f388f306b86fb0963f2813aec /fs/nfs/objlayout/objlayout.c | |
parent | Merge branch 'mailbox-for-linus' of git://git.linaro.org/landing-teams/workin... (diff) | |
parent | Boaz Harrosh - fix email in Documentation (diff) | |
download | kernel-qcow2-linux-848a552893ff1fe071c57231edcd179cf84ec4f8.tar.gz kernel-qcow2-linux-848a552893ff1fe071c57231edcd179cf84ec4f8.tar.xz kernel-qcow2-linux-848a552893ff1fe071c57231edcd179cf84ec4f8.zip |
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
Pull email address change from Boaz Harrosh.
* 'for-linus' of git://git.open-osd.org/linux-open-osd:
Boaz Harrosh - fix email in Documentation
Boaz Harrosh - Fix broken email address
MAINTAINERS: Change Boaz Harrosh's email
Diffstat (limited to 'fs/nfs/objlayout/objlayout.c')
-rw-r--r-- | fs/nfs/objlayout/objlayout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/objlayout/objlayout.c b/fs/nfs/objlayout/objlayout.c index c89357c7a914..919efd4a1a23 100644 --- a/fs/nfs/objlayout/objlayout.c +++ b/fs/nfs/objlayout/objlayout.c @@ -5,7 +5,7 @@ * All rights reserved. * * Benny Halevy <bhalevy@panasas.com> - * Boaz Harrosh <bharrosh@panasas.com> + * Boaz Harrosh <ooo@electrozaur.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 |