linux/drivers/net/ethernet/intel/ixgbe
Bjorn Helgaas 78890b5989 Merge commit 'v3.6-rc5' into next
* commit 'v3.6-rc5': (1098 commits)
  Linux 3.6-rc5
  HID: tpkbd: work even if the new Lenovo Keyboard driver is not configured
  Remove user-triggerable BUG from mpol_to_str
  xen/pciback: Fix proper FLR steps.
  uml: fix compile error in deliver_alarm()
  dj: memory scribble in logi_dj
  Fix order of arguments to compat_put_time[spec|val]
  xen: Use correct masking in xen_swiotlb_alloc_coherent.
  xen: fix logical error in tlb flushing
  xen/p2m: Fix one-off error in checking the P2M tree directory.
  powerpc: Don't use __put_user() in patch_instruction
  powerpc: Make sure IPI handlers see data written by IPI senders
  powerpc: Restore correct DSCR in context switch
  powerpc: Fix DSCR inheritance in copy_thread()
  powerpc: Keep thread.dscr and thread.dscr_inherit in sync
  powerpc: Update DSCR on all CPUs when writing sysfs dscr_default
  powerpc/powernv: Always go into nap mode when CPU is offline
  powerpc: Give hypervisor decrementer interrupts their own handler
  powerpc/vphn: Fix arch_update_cpu_topology() return value
  ARM: gemini: fix the gemini build
  ...

Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
	drivers/rapidio/devices/tsi721.c
2012-09-13 08:41:01 -06: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 missing braces 2012-08-10 16:51:23 -07:00
ixgbe_common.c ixgbe: Only enable anti-spoof on VF pools 2012-07-19 18:20:23 -07:00
ixgbe_common.h ixgbe: Correctly set SAN MAC RAR pool to default pool of PF 2012-07-19 18:19:37 -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: Populate the prio_tc_map in ixgbe_setup_tc 2012-07-14 14:29:19 -07:00
ixgbe_dcb.c ixgbe: Use num_tcs.pg_tcs as upper limit for TC when checking based on UP 2012-07-21 16:05:28 -07:00
ixgbe_dcb.h ixgbe: Populate the prio_tc_map in ixgbe_setup_tc 2012-07-14 14:29:19 -07:00
ixgbe_ethtool.c ixgbe: Retire RSS enabled and capable flags 2012-07-18 13:29:05 -07:00
ixgbe_fcoe.c ixgbe: Enable FCoE FSO and CRC offloads based on CAPABLE instead of ENABLED flag 2012-07-19 18:21:22 -07:00
ixgbe_fcoe.h ixgbe: Make FCoE allocation and configuration closer to how rings work 2012-07-19 18:18:49 -07:00
ixgbe_lib.c ixgbe: Use 1TC DCB instead of disabling DCB for MSI and legacy interrupts 2012-07-21 16:07:13 -07:00
ixgbe_main.c Merge branch 'pci/stephen-const' into next 2012-09-12 13:54:10 -06: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 build with PCI_IOV enabled. 2012-07-22 12:36:41 -07:00
ixgbe_sriov.h ixgbe: Change how we check for pre-existing and assigned VFs 2012-07-21 16:02:56 -07: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 new 82599 device 2012-07-21 16:06:46 -07:00
ixgbe_x540.c ixgbe: Correctly set SAN MAC RAR pool to default pool of PF 2012-07-19 18:19:37 -07:00
ixgbe.h ixgbe: Reduce Rx header size to what is actually used 2012-07-21 16:04:51 -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