linux/drivers/net/ethernet/intel/igb
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
..
e1000_82575.c igb: Fix for failure to init on some 82576 devices. 2012-08-04 02:43:47 -07:00
e1000_82575.h igb: Add Support for new i210/i211 devices. 2012-05-12 13:17:13 -07:00
e1000_defines.h igb: Disable the BMC-to-OS Watchdog Enable bit for DMAC. 2012-05-17 05:04:21 -07:00
e1000_hw.h igb: Add Support for new i210/i211 devices. 2012-05-12 13:17:13 -07:00
e1000_i210.c igb: Add Support for new i210/i211 devices. 2012-05-12 13:17:13 -07:00
e1000_i210.h igb: Add Support for new i210/i211 devices. 2012-05-12 13:17:13 -07:00
e1000_mac.c igb: Add Support for new i210/i211 devices. 2012-05-12 13:17:13 -07:00
e1000_mac.h igb: Update Copyright on all Intel copyrighted files. 2012-01-19 12:35:06 -05:00
e1000_mbx.c igb: Update Copyright on all Intel copyrighted files. 2012-01-19 12:35:06 -05:00
e1000_mbx.h igb: Update Copyright on all Intel copyrighted files. 2012-01-19 12:35:06 -05:00
e1000_nvm.c igb: Add Support for new i210/i211 devices. 2012-05-12 13:17:13 -07:00
e1000_nvm.h igb: Update Copyright on all Intel copyrighted files. 2012-01-19 12:35:06 -05:00
e1000_phy.c igb: Add Support for new i210/i211 devices. 2012-05-12 13:17:13 -07:00
e1000_phy.h igb: Add Support for new i210/i211 devices. 2012-05-12 13:17:13 -07:00
e1000_regs.h igb: Fix register defines for all non-82575 hardware 2012-08-09 02:36:05 -07:00
igb_ethtool.c igb: add delay to allow igb loopback test to succeed on 8086:10c9 2012-08-07 00:47:51 -07:00
igb_main.c Merge commit 'v3.6-rc5' into next 2012-09-13 08:41:01 -06:00
igb_ptp.c igb: Add switch case for supported hardware to igb_ptp_remove. 2012-06-20 01:14:34 -07:00
igb.h igb: Update firmware info output 2012-06-20 01:36:23 -07:00
Makefile igb: Add Support for new i210/i211 devices. 2012-05-12 13:17:13 -07:00