diff options
| author | David S. Miller <davem@davemloft.net> | 2015-03-02 21:27:23 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-02 21:27:23 +0100 |
| commit | eee617a1c35dbf598690879f13dc3df548fd6ea6 (patch) | |
| tree | 587a55ff547e7db7ad5e38637fc484bb146f9c0d /fs/xfs/xfs_ioctl.c | |
| parent | Merge branch 'bcmgenet_systemport_stats' (diff) | |
| parent | net/mlx4_en: Disbale GRO for incoming loopback/selftest packets (diff) | |
| download | linux-eee617a1c35dbf598690879f13dc3df548fd6ea6.tar.xz linux-eee617a1c35dbf598690879f13dc3df548fd6ea6.zip | |
Merge branch 'mlx4'
Or Gerlitz says:
====================
Mellanox driver fixes
Two small fixes, please apply to net.
Both patches should go to 3.19.y too.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/xfs/xfs_ioctl.c')
0 files changed, 0 insertions, 0 deletions