forked from Minki/linux
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 |
||
|---|---|---|
| .. | ||
| include/mach | ||
| avila-pci.c | ||
| avila-setup.c | ||
| common-pci.c | ||
| common.c | ||
| coyote-pci.c | ||
| coyote-setup.c | ||
| dsmg600-pci.c | ||
| dsmg600-setup.c | ||
| fsg-pci.c | ||
| fsg-setup.c | ||
| gateway7001-pci.c | ||
| gateway7001-setup.c | ||
| goramo_mlr.c | ||
| gtwx5715-pci.c | ||
| gtwx5715-setup.c | ||
| ixdp425-pci.c | ||
| ixdp425-setup.c | ||
| ixdpg425-pci.c | ||
| ixp4xx_npe.c | ||
| ixp4xx_qmgr.c | ||
| Kconfig | ||
| Makefile | ||
| Makefile.boot | ||
| nas100d-pci.c | ||
| nas100d-setup.c | ||
| nslu2-pci.c | ||
| nslu2-setup.c | ||
| wg302v2-pci.c | ||
| wg302v2-setup.c | ||