aboutsummaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-04-10 14:33:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-10 14:33:02 -0700
commit9e897e13bd46fa03485468609741974259a8c573 (patch)
treeebf95f236e95f074f0ad7a6f99d13e816f594f8a /MAINTAINERS
parent4ba85265790ba3681deeaf73f018c0eb829a7341 (diff)
parentf1f6630b53e702648a248fecd881f3df5968a31a (diff)
downloadlinux-linaro-stable-9e897e13bd46fa03485468609741974259a8c573.tar.gz
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
Pull exofs updates from Boaz Harrosh: "Trivial updates to exofs for 3.15-rc1 Just a few fixes sent by people" * 'for-linus' of git://git.open-osd.org/linux-open-osd: MAINTAINERS: Update email address for bhalevy fs: Mark functions as static in exofs/ore_raid.c fs: Mark function as static in exofs/super.c
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index beaa87a6e7fa..6dc67b1fdb50 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6543,7 +6543,7 @@ F: drivers/net/wireless/orinoco/
OSD LIBRARY and FILESYSTEM
M: Boaz Harrosh <bharrosh@panasas.com>
-M: Benny Halevy <bhalevy@tonian.com>
+M: Benny Halevy <bhalevy@primarydata.com>
L: osd-dev@open-osd.org
W: http://open-osd.org
T: git git://git.open-osd.org/open-osd.git