Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
commit5ad587283cc15f71bb0e9cb9e0933dd8ebd66e1c
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 29 Feb 2008 16:28:46 +0000 (29 08:28 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 29 Feb 2008 16:28:46 +0000 (29 08:28 -0800)
tree743564a6e48fa6bc3667ca01d9d12452ebbcffcf
parentf511d7edf53bd49c16131fce28b87428c16239ad
parent030f1b2f5d880c1ad3d7e0b71fc383f00f38f8f7
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:
  MAINTAINERS: neteffect update
  RDMA/nes: Fix interrupt moderation low threshold
  RDMA/nes: Fix CRC endianness for RDMA connection establishment on big-endian
  RDMA/nes: Fix use-after-free in mini_cm_dec_refcnt_listen()
  RDMA/nes: Fix use-after-free in nes_create_cq()
  RDMA/nes: Fix a check-after-use in nes_probe()
  RDMA/nes: Fix a memory leak in schedule_nes_timer()
  RDMA/nes: Fix off-by-one
  RDMA/nes: Resurrect error path dead code
  RDMA/cxgb3: Fix shift calc in build_phys_page_list() for 1-entry page lists