Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 14 Oct 2007 01:16:49 +0000 (18:16 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 14 Oct 2007 01:16:49 +0000 (18:16 -0700)
commitd773b33972a663cfaf066e966f87922a74088a1e
treec19f978f2c9a1be0d7a416eabe217f627392e383
parentac3f5753ea37d55c85aaf96211c13038fcc69aef
parentb027cacdabc3ffe2d2b97a55375203add64a5d29
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:
  mlx4_core: Fix infinite loop on device initialization