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