diff options
| author | Roland Dreier <roland@purestorage.com> | 2014-12-15 18:19:20 -0800 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2014-12-15 18:19:20 -0800 |
| commit | a7cfef21e3d066343bec14d3113a9f9c92d1c2a8 (patch) | |
| tree | 78e7bd5cd95342908848bddb9b4821db37672f52 | |
| parent | 346f98b41b76281bd0b748fb86bc1953c9fd9fe2 (diff) | |
| parent | e6b11163d41d288a9c5732b85bf6760eb817d3e1 (diff) | |
| parent | ce347ab90eaabc69a6146d41943981d51e7a9b82 (diff) | |
| parent | 056da88f2e0c2853f50efd25e94f208c1a175f7a (diff) | |
| parent | 0b9976577c47cea96933c2e0bc6e90976ff225c4 (diff) | |
| parent | e5f0508d43b45d138d426afcaa1e4cce7658cff4 (diff) | |
| parent | b4cfe447d47b5763f630412fd5dc5fbe66e991d1 (diff) | |
| parent | 7dcf9c193bfb779ecf667ee7b059851c71287b17 (diff) | |
Merge branches 'core', 'cxgb4', 'ipoib', 'iser', 'mlx4', 'ocrdma', 'odp' and 'srp' into for-next