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 |
||
---|---|---|
.. | ||
.gitignore | ||
8250-platform.c | ||
asm-offsets.c | ||
binfmt_elfn32.c | ||
binfmt_elfo32.c | ||
branch.c | ||
cevt-bcm1480.c | ||
cevt-ds1287.c | ||
cevt-gt641xx.c | ||
cevt-r4k.c | ||
cevt-sb1250.c | ||
cevt-smtc.c | ||
cevt-txx9.c | ||
cpu-bugs64.c | ||
cpu-probe.c | ||
csrc-bcm1480.c | ||
csrc-ioasic.c | ||
csrc-r4k.c | ||
csrc-sb1250.c | ||
early_printk.c | ||
entry.S | ||
genex.S | ||
gpio_txx9.c | ||
head.S | ||
i8253.c | ||
i8259.c | ||
init_task.c | ||
irq-gic.c | ||
irq-gt641xx.c | ||
irq-msc01.c | ||
irq-rm7000.c | ||
irq-rm9000.c | ||
irq.c | ||
irq_cpu.c | ||
irq_txx9.c | ||
kgdb.c | ||
kspd.c | ||
linux32.c | ||
machine_kexec.c | ||
Makefile | ||
mips-mt-fpaff.c | ||
mips-mt.c | ||
mips_ksyms.c | ||
module.c | ||
octeon_switch.S | ||
proc.c | ||
process.c | ||
ptrace.c | ||
ptrace32.c | ||
r4k_fpu.S | ||
r4k_switch.S | ||
r2300_fpu.S | ||
r2300_switch.S | ||
r6000_fpu.S | ||
relocate_kernel.S | ||
reset.c | ||
rtlx.c | ||
scall32-o32.S | ||
scall64-64.S | ||
scall64-n32.S | ||
scall64-o32.S | ||
setup.c | ||
signal-common.h | ||
signal.c | ||
signal32.c | ||
signal_n32.c | ||
smp-cmp.c | ||
smp-mt.c | ||
smp-up.c | ||
smp.c | ||
smtc-asm.S | ||
smtc-proc.c | ||
smtc.c | ||
spram.c | ||
stacktrace.c | ||
sync-r4k.c | ||
syscall.c | ||
time.c | ||
topology.c | ||
traps.c | ||
unaligned.c | ||
vmlinux.lds.S | ||
vpe.c | ||
watch.c |