Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 18 Feb 2008 23:52:40 +0000 (15:52 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 18 Feb 2008 23:52:40 +0000 (15:52 -0800)
commitf702c5815696bfca095cc1173fff6995c4d39844
treef96bd0c4de6e12d06891bbd9760fe7bb213a3a60
parent0165d7f476b99eb637027c2f69c365f00260f188
parent51af33e8e45b845d8ee85446f58e31bc4c118048
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/nes: Fix possible array overrun
  RDMA/nes: Fix VLAN support
  RDMA/nes: Fix MAC interrupt erroneously masked on ifdown
  IB: Fix return value in ib_device_register_sysfs()