linux/drivers/net/ethernet/intel/e1000e
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
..
80003es2lan.c e1000e: Driver workaround for IPv6 Header Extension Erratum. 2012-05-03 02:29:04 -07:00
82571.c e1000e: 82571 Tx Data Corruption during Tx hang recovery 2012-08-07 00:41:36 -07:00
defines.h e1000e: remove use of IP payload checksum 2012-07-01 00:25:32 -07:00
e1000.h e1000e: DoS while TSO enabled caused by link partner with small MSS 2012-08-30 12:40:22 -04:00
ethtool.c e1000e: advertise transmit time stamping 2012-07-22 12:33:32 -07:00
hw.h e1000e: initial support for i217 2012-05-04 03:15:06 -07:00
ich8lan.c e1000e: fix test for PHY being accessible on 82577/8/9 and I217 2012-07-14 00:45:45 -07:00
mac.c e1000e: test for valid check_reset_block function pointer 2012-06-05 20:47:50 -07:00
Makefile e1000e: update copyright year 2012-01-26 19:01:17 -08:00
manage.c e1000e: cleanup boolean logic 2012-04-14 02:05:00 -07:00
netdev.c Merge commit 'v3.6-rc5' into next 2012-09-13 08:41:01 -06:00
nvm.c e1000e: rename e1000e_reload_nvm() and call as function pointer 2012-02-24 21:43:21 -08:00
param.c e1000e: use more informative logging macros when netdev not yet registered 2012-06-14 03:03:14 -07:00
phy.c e1000e: test for valid check_reset_block function pointer 2012-06-05 20:47:50 -07:00