Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 24 Sep 2007 05:39:57 +0000 (22:39 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 24 Sep 2007 05:39:57 +0000 (22:39 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/mlx4: Fix data corruption triggered by wrong headroom marking order


Trivial merge