diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-10 23:33:02 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-10 23:33:02 +0200 |
| commit | 9e897e13bd46fa03485468609741974259a8c573 (patch) | |
| tree | ebf95f236e95f074f0ad7a6f99d13e816f594f8a /MAINTAINERS | |
| parent | Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86 (diff) | |
| parent | MAINTAINERS: Update email address for bhalevy (diff) | |
| download | linux-9e897e13bd46fa03485468609741974259a8c573.tar.xz linux-9e897e13bd46fa03485468609741974259a8c573.zip | |
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-- | MAINTAINERS | 2 |
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 |