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/ore_raid.h | |
| 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/ore_raid.h')
| -rw-r--r-- | fs/exofs/ore_raid.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/exofs/ore_raid.h b/fs/exofs/ore_raid.h index cf6375d82129..a6e746775570 100644 --- a/fs/exofs/ore_raid.h +++ b/fs/exofs/ore_raid.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (C) from 2011 | 2 | * Copyright (C) from 2011 |
| 3 | * Boaz Harrosh <bharrosh@panasas.com> | 3 | * Boaz Harrosh <ooo@electrozaur.com> |
| 4 | * | 4 | * |
| 5 | * This file is part of the objects raid engine (ore). | 5 | * This file is part of the objects raid engine (ore). |
| 6 | * | 6 | * |