Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
commitb1292b17dc03fcd90f3301974cea1b7c61371ba5
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 12 Feb 2008 04:43:14 +0000 (11 20:43 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 12 Feb 2008 04:43:14 +0000 (11 20:43 -0800)
treea2c76d531711a0b40c15e46b163fa94b65a2f227
parentc76d118ecc5fcac7c823fb428676860dba0fdd20
parent29c271123dc7895a9f77d3e61e747b2a052d0a2a
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 build break (missing include)