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)
commit7bae705ef2c2daac1993de03e5be93b5c300fc5e
tree86ba64414d37902f3e1093f017eea10409316976
parent562b4b632c9639cc36e09b2dec32c6b3ca65ca03
parent6e694ea33e7a7fad908d188c46f441f04fb633d4
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:
  IB/mlx4: Fix data corruption triggered by wrong headroom marking order