]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/linux-uek into uek...
authorChuck Anderson <chuck.anderson@oracle.com>
Tue, 25 Oct 2016 08:12:56 +0000 (01:12 -0700)
committerChuck Anderson <chuck.anderson@oracle.com>
Tue, 25 Oct 2016 08:12:56 +0000 (01:12 -0700)
1  2 
drivers/infiniband/hw/mlx4/cq.c
drivers/net/ethernet/mellanox/mlx4/eq.c

Simple merge