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)
Pulling to get some TIPC fixes that a net-next series depends
upon.

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

Simple merge