tree c19f978f2c9a1be0d7a416eabe217f627392e383
parent ac3f5753ea37d55c85aaf96211c13038fcc69aef
parent b027cacdabc3ffe2d2b97a55375203add64a5d29
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1192324609 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1192324609 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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