tree 1490343b5ad9f88b9333e53fa9457c00cbf6c2d1
parent 1bb4238b17b5de6cdc120970a9d00dd8a44f40df
parent 15ba2236f3556fc01b9ca91394465152b5ea74b6
author David S. Miller <davem@davemloft.net> 1406015099 -0700
committer David S. Miller <davem@davemloft.net> 1406015099 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/infiniband/hw/cxgb4/device.c

The cxgb4 conflict was simply overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>