David S. Miller 1459143386 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ieee802154/fakehard.c A bug fix went into 'net' for ieee802154/fakehard.c, which is removed in 'net-next'. Add build fix into the merge from Stephen Rothwell in openvswitch, the logging macros take a new initial 'log' argument, a new call was added in 'net' so when we merge that in here we have to explicitly add the new 'log' arg to it else the build fails. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-11-21 22:28:24 -05:00
..
be_cmds.c	be2net: fix alignment on line wrap	2014-09-22 15:01:09 -04:00
be_cmds.h	be2net: add speed reporting for 20G-KR interface	2014-09-22 15:01:07 -04:00
be_ethtool.c	be2net: fix alignment on line wrap	2014-09-22 15:01:09 -04:00
be_hw.h	be2net: Add TX completion error statistics in ethtool	2014-09-02 12:45:59 -07:00
be_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-11-21 22:28:24 -05:00
be_roce.c	be2net: add blank line after declarations	2014-09-22 15:01:08 -04:00
be_roce.h	be2net: Issue shutdown event to ocrdma driver	2014-08-01 15:07:36 -07:00
be.h	be2net: fix port-type reporting in get_settings	2014-09-13 17:12:15 -04:00
Kconfig	be2net: fix build dependency on VxLAN	2014-04-01 16:25:51 -04:00
Makefile