Linus Torvalds d7e9660ad9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 ... * 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 89f56d1e9 ("tun: reuse struct sock fields") that switched over to using 'tun->socket.sk' instead of the redundantly available (and thus removed) 'tun->sk', and 2b980dbd ("lsm: Add hooks to the TUN driver") which added a new 'tun->sk' use. Noted in 'next' by Stephen Rothwell.		2009-09-14 10:37:28 -07:00
..
core-card.c	firewire: core: do not DMA-map stack addresses	2009-06-25 19:42:36 +02:00
core-cdev.c	firewire: core: do not DMA-map stack addresses	2009-06-25 19:42:36 +02:00
core-device.c
core-iso.c	firewire: core: fix crash in iso resource management	2009-09-05 15:59:34 +02:00
core-topology.c
core-transaction.c
core.h	firewire: core: do not DMA-map stack addresses	2009-06-25 19:42:36 +02:00
Kconfig	firewire: new stack is no longer experimental	2009-06-21 10:53:26 +02:00
Makefile
net.c	drivers: Kill now superfluous ->last_rx stores	2009-09-02 23:07:36 -07:00
ohci.c	firewire: ohci: fix Ricoh R5C832, video reception	2009-09-05 15:59:34 +02:00
ohci.h
sbp2.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2009-09-05 14:59:00 -07:00