6ba74014c1
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1443 commits) phy/marvell: add 88ec048 support igb: Program MDICNFG register prior to PHY init e1000e: correct MAC-PHY interconnect register offset for 82579 hso: Add new product ID can: Add driver for esd CAN-USB/2 device l2tp: fix export of header file for userspace can-raw: Fix skb_orphan_try handling Revert "net: remove zap_completion_queue" net: cleanup inclusion phy/marvell: add 88e1121 interface mode support u32: negative offset fix net: Fix a typo from "dev" to "ndev" igb: Use irq_synchronize per vector when using MSI-X ixgbevf: fix null pointer dereference due to filter being set for VLAN 0 e1000e: Fix irq_synchronize in MSI-X case e1000e: register pm_qos request on hardware activation ip_fragment: fix subtracting PPPOE_SES_HLEN from mtu twice net: Add getsockopt support for TCP thin-streams cxgb4: update driver version cxgb4: add new PCI IDs ... Manually fix up conflicts in: - drivers/net/e1000e/netdev.c: due to pm_qos registration infrastructure changes - drivers/net/phy/marvell.c: conflict between adding 88ec048 support and cleaning up the IDs - drivers/net/wireless/ipw2x00/ipw2100.c: trivial ipw2100_pm_qos_req conflict (registration change vs marking it static) |
||
|---|---|---|
| .. | ||
| asm-compat.h | ||
| asm-offsets.h | ||
| atomic.h | ||
| auxvec.h | ||
| bitops.h | ||
| bitsperlong.h | ||
| bug.h | ||
| bugs.h | ||
| byteorder.h | ||
| cache.h | ||
| cacheflush.h | ||
| checksum.h | ||
| clinkage.h | ||
| cpuinfo.h | ||
| cputable.h | ||
| cputime.h | ||
| current.h | ||
| delay.h | ||
| device.h | ||
| div64.h | ||
| dma-mapping.h | ||
| dma.h | ||
| elf.h | ||
| emergency-restart.h | ||
| entry.h | ||
| errno.h | ||
| exceptions.h | ||
| fb.h | ||
| fcntl.h | ||
| flat.h | ||
| ftrace.h | ||
| futex.h | ||
| gpio.h | ||
| hardirq.h | ||
| hw_irq.h | ||
| io.h | ||
| ioctl.h | ||
| ioctls.h | ||
| ipcbuf.h | ||
| irq_regs.h | ||
| irq.h | ||
| irqflags.h | ||
| Kbuild | ||
| kdebug.h | ||
| kmap_types.h | ||
| linkage.h | ||
| local.h | ||
| memblock.h | ||
| mman.h | ||
| mmu_context_mm.h | ||
| mmu_context.h | ||
| mmu.h | ||
| module.h | ||
| msgbuf.h | ||
| mutex.h | ||
| namei.h | ||
| of_device.h | ||
| of_platform.h | ||
| page.h | ||
| param.h | ||
| parport.h | ||
| pci-bridge.h | ||
| pci.h | ||
| percpu.h | ||
| pgalloc.h | ||
| pgtable.h | ||
| poll.h | ||
| posix_types.h | ||
| processor.h | ||
| prom.h | ||
| ptrace.h | ||
| pvr.h | ||
| registers.h | ||
| resource.h | ||
| scatterlist.h | ||
| sections.h | ||
| selfmod.h | ||
| sembuf.h | ||
| serial.h | ||
| setup.h | ||
| shmbuf.h | ||
| shmparam.h | ||
| sigcontext.h | ||
| siginfo.h | ||
| signal.h | ||
| socket.h | ||
| sockios.h | ||
| stat.h | ||
| statfs.h | ||
| string.h | ||
| swab.h | ||
| syscall.h | ||
| syscalls.h | ||
| system.h | ||
| termbits.h | ||
| termios.h | ||
| thread_info.h | ||
| timex.h | ||
| tlb.h | ||
| tlbflush.h | ||
| topology.h | ||
| types.h | ||
| uaccess.h | ||
| ucontext.h | ||
| unaligned.h | ||
| unistd.h | ||
| user.h | ||
| vga.h | ||
| xor.h | ||