summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2012-06-06 19:08:11 +0200
committerRoland Dreier <roland@purestorage.com>2012-06-06 19:08:11 +0200
commit20952cdd8e79945245be29f8f5ecac5abc99b4ae (patch)
tree6203c5a3c47f41ad79979810fc1aab6f74e13b62 /drivers/net
parentRDMA/cxgb4: Fix crash when peer address is 0.0.0.0 (diff)
parentIB/mlx4: Fix max_wqe capacity reported from query device (diff)
parentRDMA/ocrdma: Remove unnecessary version.h includes (diff)
downloadlinux-20952cdd8e79945245be29f8f5ecac5abc99b4ae.tar.xz
linux-20952cdd8e79945245be29f8f5ecac5abc99b4ae.zip
Merge branches 'cxgb4', 'mlx4' and 'ocrdma' into for-linus