mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-18 22:14:16 +00:00
d7e9660ad9
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1623 commits) netxen: update copyright netxen: fix tx timeout recovery netxen: fix file firmware leak netxen: improve pci memory access netxen: change firmware write size tg3: Fix return ring size breakage netxen: build fix for INET=n cdc-phonet: autoconfigure Phonet address Phonet: back-end for autoconfigured addresses Phonet: fix netlink address dump error handling ipv6: Add IFA_F_DADFAILED flag net: Add DEVTYPE support for Ethernet based devices mv643xx_eth.c: remove unused txq_set_wrr() ucc_geth: Fix hangs after switching from full to half duplex ucc_geth: Rearrange some code to avoid forward declarations phy/marvell: Make non-aneg speed/duplex forcing work for 88E1111 PHYs drivers/net/phy: introduce missing kfree drivers/net/wan: introduce missing kfree net: force bridge module(s) to be GPL Subject: [PATCH] appletalk: Fix skb leak when ipddp interface is not loaded ... Fixed up trivial conflicts: - arch/x86/include/asm/socket.h converted to <asm-generic/socket.h> in the x86 tree. The generic header has the same new #define's, so that works out fine. - drivers/net/tun.c fix conflict between |
||
|---|---|---|
| .. | ||
| 8253pit.h | ||
| a.out-core.h | ||
| a.out.h | ||
| agp.h | ||
| agp_backend.h | ||
| atomic.h | ||
| auxvec.h | ||
| barrier.h | ||
| bitops.h | ||
| bitsperlong.h | ||
| bug.h | ||
| bugs.h | ||
| byteorder.h | ||
| cache.h | ||
| cacheflush.h | ||
| checksum.h | ||
| compiler.h | ||
| console.h | ||
| core_apecs.h | ||
| core_cia.h | ||
| core_irongate.h | ||
| core_lca.h | ||
| core_marvel.h | ||
| core_mcpcia.h | ||
| core_polaris.h | ||
| core_t2.h | ||
| core_titan.h | ||
| core_tsunami.h | ||
| core_wildfire.h | ||
| cputime.h | ||
| current.h | ||
| delay.h | ||
| device.h | ||
| div64.h | ||
| dma-mapping.h | ||
| dma.h | ||
| elf.h | ||
| emergency-restart.h | ||
| err_common.h | ||
| err_ev6.h | ||
| err_ev7.h | ||
| errno.h | ||
| fb.h | ||
| fcntl.h | ||
| floppy.h | ||
| fpu.h | ||
| ftrace.h | ||
| futex.h | ||
| gct.h | ||
| gentrap.h | ||
| hardirq.h | ||
| hw_irq.h | ||
| hwrpb.h | ||
| io.h | ||
| io_trivial.h | ||
| ioctl.h | ||
| ioctls.h | ||
| ipcbuf.h | ||
| irq.h | ||
| irq_regs.h | ||
| jensen.h | ||
| Kbuild | ||
| kdebug.h | ||
| kmap_types.h | ||
| linkage.h | ||
| local.h | ||
| machvec.h | ||
| mc146818rtc.h | ||
| md.h | ||
| mman.h | ||
| mmu.h | ||
| mmu_context.h | ||
| mmzone.h | ||
| module.h | ||
| msgbuf.h | ||
| mutex.h | ||
| page.h | ||
| pal.h | ||
| param.h | ||
| parport.h | ||
| pci.h | ||
| percpu.h | ||
| pgalloc.h | ||
| pgtable.h | ||
| poll.h | ||
| posix_types.h | ||
| processor.h | ||
| ptrace.h | ||
| reg.h | ||
| regdef.h | ||
| resource.h | ||
| rtc.h | ||
| rwsem.h | ||
| scatterlist.h | ||
| sections.h | ||
| segment.h | ||
| sembuf.h | ||
| serial.h | ||
| setup.h | ||
| sfp-machine.h | ||
| shmbuf.h | ||
| shmparam.h | ||
| sigcontext.h | ||
| siginfo.h | ||
| signal.h | ||
| smp.h | ||
| socket.h | ||
| sockios.h | ||
| spinlock.h | ||
| spinlock_types.h | ||
| stat.h | ||
| statfs.h | ||
| string.h | ||
| swab.h | ||
| sysinfo.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 | ||
| xchg.h | ||
| xor.h | ||