aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-21 12:53:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-21 12:53:45 -0700
commit848a552893ff1fe071c57231edcd179cf84ec4f8 (patch)
tree720c74e623ead59f388f306b86fb0963f2813aec /MAINTAINERS
parentMerge branch 'mailbox-for-linus' of git://git.linaro.org/landing-teams/working/fujitsu/integration (diff)
parentBoaz Harrosh - fix email in Documentation (diff)
downloadlinux-dev-848a552893ff1fe071c57231edcd179cf84ec4f8.tar.xz
linux-dev-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 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
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
F: drivers/net/wireless/orinoco/
OSD LIBRARY and FILESYSTEM
-M: Boaz Harrosh <bharrosh@panasas.com>
+M: Boaz Harrosh <ooo@electrozaur.com>
M: Benny Halevy <bhalevy@primarydata.com>
L: osd-dev@open-osd.org
W: http://open-osd.org