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/file.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/file.c')
| -rw-r--r-- | fs/exofs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/exofs/file.c b/fs/exofs/file.c index 71bf8e4fb5d4..1a376b42d305 100644 --- a/fs/exofs/file.c +++ b/fs/exofs/file.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * Copyright (C) 2005, 2006 | 2 | * Copyright (C) 2005, 2006 |
| 3 | * Avishay Traeger (avishay@gmail.com) | 3 | * Avishay Traeger (avishay@gmail.com) |
| 4 | * Copyright (C) 2008, 2009 | 4 | * Copyright (C) 2008, 2009 |
| 5 | * Boaz Harrosh <bharrosh@panasas.com> | 5 | * Boaz Harrosh <ooo@electrozaur.com> |
| 6 | * | 6 | * |
| 7 | * Copyrights for code taken from ext2: | 7 | * Copyrights for code taken from ext2: |
| 8 | * Copyright (C) 1992, 1993, 1994, 1995 | 8 | * Copyright (C) 1992, 1993, 1994, 1995 |