Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
commit5db501d7e398c6a838a307adf0347cf6a2b015a3
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 19 Jan 2008 19:01:23 +0000 (19 11:01 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 19 Jan 2008 19:01:23 +0000 (19 11:01 -0800)
treeeca0e59eec37509df662b09ab45264879660f6ac
parent8b2d1833a29e9dc8bccad348396ad08666379d77
parent0a69631b2869093d7306e8f66cca8eb0a05aa919
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/ipath: Fix receiving UD messages with immediate data