diff options
author | Roland Dreier <rolandd@cisco.com> | 2009-10-07 16:03:32 -0700 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2009-10-07 16:03:32 -0700 |
commit | 335f2d1b24a350ca8099aea6db5b7adc73666d2f (patch) | |
tree | 28c819fd184821afeb5020c0020d7959e12d3f46 /Makefile | |
parent | RDMA/cxgb3: Handle NULL inetdev pointer in iwch_query_port() (diff) | |
parent | RDMA/addr: Fix resolution of local IPv6 addresses (diff) | |
parent | mlx4_core: Add 40GigE device ID (diff) | |
download | linux-dev-335f2d1b24a350ca8099aea6db5b7adc73666d2f.tar.xz linux-dev-335f2d1b24a350ca8099aea6db5b7adc73666d2f.zip |
Merge branches 'cxgb3', 'misc' and 'mlx4' into for-next