Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sat, 23 Aug 2014 18:12:08 +0000 (11:12 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 23 Aug 2014 18:12:08 +0000 (11:12 -0700)
commitf9474ddfaa009ead12bba44fa8fd49dc4536a124
treea1738a74ac909d84cc80af674d7c0b78af10a413
parent989e04c5bc3ff77d65e1f0d87bf7904dfa30d41c
parenta45e92a599e77ee6a850eabdd0141633fde03915
Merge git://git./linux/kernel/git/davem/net

Pulling to get some TIPC fixes that a net-next series depends
upon.

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/can/flexcan.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c