From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 11 Mar 2008 16:14:34 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... 
X-Git-Tag: v2.6.25-rc6~43
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=6c47d773e7d8f784996d9027f035379baa19ded7;hp=-c

Merge branch 'for-linus' of git://git./linux/kernel/git/roland/infiniband

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  RDMA/iwcm: Don't access a cm_id after dropping reference
  IB/iser: Handle iser_device allocation error gracefully
  IB/iser: Fix list iteration bug
  RDMA/cxgb3: Fix iwch_create_cq() off-by-one error
  RDMA/cxgb3: Return correct max_inline_data when creating a QP
  IB/fmr_pool: Flush all dirty FMRs from ib_fmr_pool_flush()
  Revert "IB/fmr_pool: ib_fmr_pool_flush() should flush all dirty FMRs"
  IB/cm: Flush workqueue when removing device
  MAINTAINERS: update ipath owner
---

6c47d773e7d8f784996d9027f035379baa19ded7
diff --combined MAINTAINERS
index 558636e3a954,f229e16d67ed..25f450fe1059
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1138,12 -1138,6 +1138,12 @@@ L:	accessrunner-general@lists.sourcefor
  W:	http://accessrunner.sourceforge.net/
  S:	Maintained
  
 +CONTROL GROUPS (CGROUPS)
 +P:	Paul Menage
 +M:	menage@google.com
 +L:	containers@lists.linux-foundation.org
 +S:	Maintained
 +
  CORETEMP HARDWARE MONITORING DRIVER
  P:	Rudolf Marek
  M:	r.marek@assembler.cz
@@@ -1595,13 -1589,6 +1595,13 @@@ L:	linux-fbdev-devel@lists.sourceforge.
  W:	http://linux-fbdev.sourceforge.net/
  S:	Maintained
  
 +FREESCALE DMA DRIVER
 +P;	Zhang Wei
 +M:	wei.zhang@freescale.com
 +L:	linuxppc-embedded@ozlabs.org
 +L:	linux-kernel@vger.kernel.org
 +S:	Maintained
 +
  FREESCALE SOC FS_ENET DRIVER
  P:	Pantelis Antoniou
  M:	pantelis.antoniou@gmail.com
@@@ -2156,7 -2143,7 +2156,7 @@@ L:	netdev@vger.kernel.or
  S:	Maintained
  
  IPATH DRIVER:
- P:	Arthur Jones
+ P:	Ralph Campbell
  M:	infinipath@qlogic.com
  L:	general@lists.openfabrics.org
  T:	git git://git.qlogic.com/ipath-linux-2.6
@@@ -2639,17 -2626,6 +2639,17 @@@ L:	linux-kernel@vger.kernel.or
  W:	http://www.linux-mm.org
  S:	Maintained
  
 +MEMORY RESOURCE CONTROLLER
 +P:	Balbir Singh
 +M:	balbir@linux.vnet.ibm.com
 +P:	Pavel Emelyanov
 +M:	xemul@openvz.org
 +P:	KAMEZAWA Hiroyuki
 +M:	kamezawa.hiroyu@jp.fujitsu.com
 +L:	linux-mm@kvack.org
 +L:	linux-kernel@vger.kernel.org
 +S:	Maintained
 +
  MEI MN10300/AM33 PORT
  P:	David Howells
  M:	dhowells@redhat.com