From: David S. Miller <davem@davemloft.net>
Date: Mon, 24 Oct 2011 22:18:09 +0000 (-0400)
Subject: Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.2-rc1~182^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1805b2f04855f07afe3a71d620a68f483b0ed74f;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
---

1805b2f04855f07afe3a71d620a68f483b0ed74f
diff --cc MAINTAINERS
index 5008b087cb742,b3bc88d9c03ac..bb4a83af08f25
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2468,10 -2460,10 +2468,10 @@@ S:	Supporte
  F:	drivers/infiniband/hw/ehca/
  
  EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER
- M:	Breno Leitao <leitao@linux.vnet.ibm.com>
+ M:	Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
  L:	netdev@vger.kernel.org
  S:	Maintained
 -F:	drivers/net/ehea/
 +F:	drivers/net/ethernet/ibm/ehea/
  
  EMBEDDED LINUX
  M:	Paul Gortmaker <paul.gortmaker@windriver.com>