leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8732baafc3
linux/drivers/net/ethernet/intel/ixgbe
History
David S. Miller b26d344c6b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/caif/caif_hsi.c
	drivers/net/usb/qmi_wwan.c

The qmi_wwan merge was trivial.

The caif_hsi.c, on the other hand, was not.  It's a conflict between
1c385f1fdf ("caif-hsi: Replace platform
device with ops structure.") in the net-next tree and commit
39abbaef19 ("caif-hsi: Postpone init of
HIS until open()") in the net tree.

I did my best with that one and will ask Sjur to check it out.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-06-28 17:37:00 -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 ixgbe: correct disable_rx_buff timeout 2012-05-09 23:07:26 -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 ixgbe: fix calling skb_put on nonlinear skb assertion bug 2012-04-30 18:54:52 -07:00
ixgbe_fcoe.h ixgbe: update copyright to 2012 2012-02-03 03:05:30 -08:00
ixgbe_lib.c ixgbe: Do not pad FCoE frames as this can cause issues with FCoE DDP 2012-06-26 16:44:34 -07:00
ixgbe_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-28 17:37:00 -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 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-25 15:50:32 -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 ixgbe: do not compile ixgbe_sysfs.c when CONFIG_IXGBE_HWMON is not set 2012-06-14 03:12:41 -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