Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 19 Jan 2008 19:01:23 +0000 (11:01 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 19 Jan 2008 19:01:23 +0000 (11:01 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/ipath: Fix receiving UD messages with immediate data


Trivial merge