diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-21 15:53:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-21 15:53:45 -0400 |
commit | 848a552893ff1fe071c57231edcd179cf84ec4f8 (patch) | |
tree | 720c74e623ead59f388f306b86fb0963f2813aec /fs/exofs/sys.c | |
parent | 43d451f163c1b615c1bedef95258c49712679eeb (diff) | |
parent | 1fa3a002b2546c42c343c77c144871285896ced5 (diff) |
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/exofs/sys.c')
-rw-r--r-- | fs/exofs/sys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/exofs/sys.c b/fs/exofs/sys.c index 1b4f2f95fc37..5e6a2c0a1f0b 100644 --- a/fs/exofs/sys.c +++ b/fs/exofs/sys.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2012 | 2 | * Copyright (C) 2012 |
3 | * Sachin Bhamare <sbhamare@panasas.com> | 3 | * Sachin Bhamare <sbhamare@panasas.com> |
4 | * Boaz Harrosh <bharrosh@panasas.com> | 4 | * Boaz Harrosh <ooo@electrozaur.com> |
5 | * | 5 | * |
6 | * This file is part of exofs. | 6 | * This file is part of exofs. |
7 | * | 7 | * |