diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-21 10:36:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-21 10:36:06 -0700 |
| commit | e08f6d4131ab964420f0bcabecc68d75fb49df79 (patch) | |
| tree | e1d2116899c4e0240d0c5ae4507f67ab801c91ee /init/Kconfig | |
| parent | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 (diff) | |
| parent | Merge branches 'cxgb4' and 'qib' into for-next (diff) | |
| download | linux-dev-e08f6d4131ab964420f0bcabecc68d75fb49df79.tar.xz linux-dev-e08f6d4131ab964420f0bcabecc68d75fb49df79.zip | |
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/qib: Ensure that LOS and DFE are being turned off
RDMA/cxgb4: Couple of abort fixes
RDMA/cxgb4: Don't truncate MR lengths
RDMA/cxgb4: Don't exceed hw IQ depth limit for user CQs
Diffstat (limited to 'init/Kconfig')
0 files changed, 0 insertions, 0 deletions