David S. Miller 04c9f416e3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/batman-adv/bridge_loop_avoidance.c net/batman-adv/bridge_loop_avoidance.h net/batman-adv/soft-interface.c net/mac80211/mlme.c With merge help from Antonio Quartulli (batman-adv) and Stephen Rothwell (drivers/net/usb/qmi_wwan.c). The net/mac80211/mlme.c conflict seemed easy enough, accounting for a conversion to some new tracing macros. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-07-10 23:56:33 -07:00
..
ixgbe_82598.c	ixgbe: Update link flow control to correctly handle multiple packet buffer DCB	2012-05-04 03:25:24 -07:00
ixgbe_82599.c	ixgbe: add support for 1G SX modules	2012-06-20 01:37:04 -07:00
ixgbe_common.c	drivers/net/ethernet: Fix (nearly-)kernel-doc comments for various functions	2012-07-10 23:13:46 -07:00
ixgbe_common.h	ixgbe: Update link flow control to correctly handle multiple packet buffer DCB	2012-05-04 03:25:24 -07:00
ixgbe_dcb_82598.c	ixgbe: Clean up priority based flow control	2012-05-09 22:15:40 -07:00
ixgbe_dcb_82598.h	ixgbe: update copyright to 2012	2012-02-03 03:05:30 -08:00
ixgbe_dcb_82599.c	ixgbe: Clean up priority based flow control	2012-05-09 22:15:40 -07:00
ixgbe_dcb_82599.h	ixgbe: update copyright to 2012	2012-02-03 03:05:30 -08:00
ixgbe_dcb_nl.c	ixgbe: Set Drop_EN bit when multiple Rx queues are present w/o flow control	2012-05-09 22:31:44 -07:00
ixgbe_dcb.c	ixgbe: update copyright to 2012	2012-02-03 03:05:30 -08:00
ixgbe_dcb.h	ixgbe: update copyright to 2012	2012-02-03 03:05:30 -08:00
ixgbe_ethtool.c	ixgbe: clean up ixgbe_get_settings ethtool function	2012-06-20 01:37:14 -07:00
ixgbe_fcoe.c	drivers/net/ethernet: Fix (nearly-)kernel-doc comments for various functions	2012-07-10 23:13:46 -07:00
ixgbe_fcoe.h	ixgbe: update copyright to 2012	2012-02-03 03:05:30 -08:00
ixgbe_lib.c	drivers/net/ethernet: Fix (nearly-)kernel-doc comments for various functions	2012-07-10 23:13:46 -07:00
ixgbe_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-07-10 23:56:33 -07:00
ixgbe_mbx.c	ixgbe: update copyright to 2012	2012-02-03 03:05:30 -08:00
ixgbe_mbx.h	ixgbe: update copyright to 2012	2012-02-03 03:05:30 -08:00
ixgbe_phy.c	ixgbe: add support for 1G SX modules	2012-06-20 01:37:04 -07:00
ixgbe_phy.h	ixgbe: update copyright to 2012	2012-02-03 03:05:30 -08:00
ixgbe_ptp.c	drivers/net/ethernet: Fix (nearly-)kernel-doc comments for various functions	2012-07-10 23:13:46 -07:00
ixgbe_sriov.c	ixgbe: Fix bogus error message	2012-05-09 22:40:29 -07:00
ixgbe_sriov.h	ixgbe: update copyright to 2012	2012-02-03 03:05:30 -08:00
ixgbe_sysfs.c	drivers/net/ethernet: Fix (nearly-)kernel-doc comments for various functions	2012-07-10 23:13:46 -07:00
ixgbe_type.h	ixgbe: add support for 1G SX modules	2012-06-20 01:37:04 -07:00
ixgbe_x540.c	ixgbe: add hwmon interface to export thermal data	2012-05-02 02:12:23 -07:00
ixgbe.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-28 17:37:00 -07:00
Makefile	ixgbe: do not compile ixgbe_sysfs.c when CONFIG_IXGBE_HWMON is not set	2012-06-14 03:12:41 -07:00