diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-07-01 09:57:25 +0200 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-07-01 09:57:25 +0200 |
commit | 24a72acac155576d630cf4304fa9cefb9b62ea1f (patch) | |
tree | 84d09427b319c613512316c658a3f6d6d8fe3dd1 /MAINTAINERS | |
parent | powerpc/pseries: Inform the hypervisor we are using EBB regs (diff) | |
parent | Linux 3.10 (diff) | |
download | linux-24a72acac155576d630cf4304fa9cefb9b62ea1f.tar.xz linux-24a72acac155576d630cf4304fa9cefb9b62ea1f.zip |
Merge tag 'v3.10' into next
Merge 3.10 in order to get some of the last minute powerpc
changes, resolve conflicts and add additional fixes on top
of them.
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ebeceeb9dfab..b888b1a4d247 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3227,7 +3227,7 @@ F: lib/fault-inject.c FCOE SUBSYSTEM (libfc, libfcoe, fcoe) M: Robert Love <robert.w.love@intel.com> -L: devel@open-fcoe.org +L: fcoe-devel@open-fcoe.org W: www.Open-FCoE.org S: Supported F: drivers/scsi/libfc/ |