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 /MAINTAINERS | |
| 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 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b4b05dd4ffe3..0484f2c526f0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -6830,7 +6830,7 @@ S: Orphan | |||
| 6830 | F: drivers/net/wireless/orinoco/ | 6830 | F: drivers/net/wireless/orinoco/ |
| 6831 | 6831 | ||
| 6832 | OSD LIBRARY and FILESYSTEM | 6832 | OSD LIBRARY and FILESYSTEM |
| 6833 | M: Boaz Harrosh <bharrosh@panasas.com> | 6833 | M: Boaz Harrosh <ooo@electrozaur.com> |
| 6834 | M: Benny Halevy <bhalevy@primarydata.com> | 6834 | M: Benny Halevy <bhalevy@primarydata.com> |
| 6835 | L: osd-dev@open-osd.org | 6835 | L: osd-dev@open-osd.org |
| 6836 | W: http://open-osd.org | 6836 | W: http://open-osd.org |