Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 1 Dec 2007 04:07:54 +0000 (20:07 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 1 Dec 2007 04:07:54 +0000 (20:07 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/ehca: Fix static rate if path faster than link
  IPoIB: Fix oops if xmit is called when priv->broadcast is NULL


Trivial merge