2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-09 14:14:00 +08:00
linux-next/drivers/net/ethernet/broadcom
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
..
bnx2x Merge commit 'v3.6-rc5' into next 2012-09-13 08:41:01 -06:00
b44.c b44: add 64 bit stats 2012-07-18 09:29:43 -07:00
b44.h b44: add 64 bit stats 2012-07-18 09:29:43 -07:00
bcm63xx_enet.c bcm63xx-enet: fix PHY name to match MDIO bus name 2012-02-13 16:04:08 -05:00
bcm63xx_enet.h
bnx2_fw.h
bnx2.c netdev: make pci_error_handlers const 2012-09-07 16:35:00 -06:00
bnx2.h bnx2: Read PCI function number from internal register 2012-06-16 22:22:59 -07:00
cnic_defs.h cnic: Fix parity error code conflict 2012-03-21 21:57:36 -04:00
cnic_if.h cnic: Fix mmap regression. 2012-06-29 15:33:28 -07:00
cnic.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-07-10 23:56:33 -07:00
cnic.h
Kconfig
Makefile
sb1250-mac.c drivers/net: Remove alloc_etherdev error messages 2012-01-31 16:20:48 -05:00
tg3.c Merge branch 'pci/stephen-const' into next 2012-09-12 13:54:10 -06:00
tg3.h tg3: Add New 5719 Read DMA workaround 2012-07-29 23:18:31 -07:00