From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Feb 2011 19:19:26 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... 
X-Git-Tag: firefly_0821_release~7613^2~2505
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9118626a30f8a3f58674623bebd3c34961e558af;p=firefly-linux-kernel-4.4.55.git

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: Update missed conversion of flush_scheduled_work()
  RDMA/ucma: Copy iWARP route information on queries
  RDMA/amso1100: Fix compile warnings
  RDMA/cxgb4: Set the correct device physical function for iWARP connections
  RDMA/cxgb4: Limit MAXBURST EQ context field to 256B
  IB/qib: Hold link for TX SERDES settings
  mlx4_core: Add ConnectX-3 device IDs
---

9118626a30f8a3f58674623bebd3c34961e558af