diff options
author | Roland Dreier <roland@purestorage.com> | 2011-03-23 11:13:37 -0700 |
---|---|---|
committer | Roland Dreier <roland@purestorage.com> | 2011-03-23 11:13:37 -0700 |
commit | ba82638247c10cfda32268c894f78f8124f54084 (patch) | |
tree | ca46805a5343218fd7445c08a1025c74c5bfa6ac /drivers/infiniband/hw | |
parent | IB: Increase DMA max_segment_size on Mellanox hardware (diff) | |
parent | RDMA/nes: Don't print success message at level KERN_ERR (diff) | |
parent | Merge branch 'external-indirect' of git://git.kernel.org/pub/scm/linux/kernel/git/dad/srp-initiator into srp (diff) | |
download | linux-dev-ba82638247c10cfda32268c894f78f8124f54084.tar.xz linux-dev-ba82638247c10cfda32268c894f78f8124f54084.zip |
Merge branches 'misc', 'nes' and 'srp' into for-next