1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
linux/drivers/net/ethernet/intel
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 netdev: make pci_error_handlers const 2012-09-07 16:35:00 -06:00
e1000e Merge commit 'v3.6-rc5' into next 2012-09-13 08:41:01 -06:00
igb Merge commit 'v3.6-rc5' into next 2012-09-13 08:41:01 -06:00
igbvf netdev: make pci_error_handlers const 2012-09-07 16:35:00 -06:00
ixgb netdev: make pci_error_handlers const 2012-09-07 16:35:00 -06:00
ixgbe Merge commit 'v3.6-rc5' into next 2012-09-13 08:41:01 -06:00
ixgbevf netdev: make pci_error_handlers const 2012-09-07 16:35:00 -06:00
e100.c netdev: make pci_error_handlers const 2012-09-07 16:35:00 -06:00
Kconfig Kconfig: Fix Kconfig for Intel ixgbe and igb PTP support. 2012-06-20 00:52:54 -07:00
Makefile intel: Move the Intel wired LAN drivers 2011-08-10 20:03:27 -07:00