diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-02 12:10:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-02 12:10:56 -0800 |
| commit | 75318ec3277d1fc46ecc129d7ef880b269fd9ee0 (patch) | |
| tree | 168d69f005bfa39c1c79f7b9f0516bc5865ab566 /MAINTAINERS | |
| parent | 8cb280c90f9cfaab3ba3afbace0b1711dee80d0c (diff) | |
| parent | 7adce751ce79bcb6d0a591e6b94d76631c9a232c (diff) | |
| download | op-kernel-dev-75318ec3277d1fc46ecc129d7ef880b269fd9ee0.zip op-kernel-dev-75318ec3277d1fc46ecc129d7ef880b269fd9ee0.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB: Fix information leak in marshalling code
IB/pack: Remove some unused code added by the IBoE patches
IB/mlx4: Fix IBoE link state
IB/mlx4: Fix IBoE reported link rate
mlx4_core: Workaround firmware bug in query dev cap
IB/mlx4: Fix memory ordering of VLAN insertion control bits
MAINTAINERS: Update NetEffect entry
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3eafe9e..74b8e05 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4064,9 +4064,8 @@ F: drivers/scsi/NCR_D700.* NETEFFECT IWARP RNIC DRIVER (IW_NES) M: Faisal Latif <faisal.latif@intel.com> -M: Chien Tung <chien.tin.tung@intel.com> L: linux-rdma@vger.kernel.org -W: http://www.neteffect.com +W: http://www.intel.com/Products/Server/Adapters/Server-Cluster/Server-Cluster-overview.htm S: Supported F: drivers/infiniband/hw/nes/ |
