tree 7b6da4d31ab802a4d8feddea39d5cac9edfe3c1c
parent 1811534a80697b34add31cff53a321cfc291ddfe
parent b1812582ba94b5f377d5d3cec7646cc17d84e733
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1196482074 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1196482074 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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