projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db10acc 7afbddf)
Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Oct 2013 06:51:25 +0000 (07:51 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Oct 2013 06:51:25 +0000 (07:51 +0100)
Pull infiniband bugfix from Roland Dreier:
 "Disable not-quite-ready userspace ABI for IB flow steering"

* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/core: Temporarily disable create_flow/destroy_flow uverbs


Trivial merge
John Crispins staging tree