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
..
claw.c	net: convert remaining non-symbolic return values in ndo_start_xmit() functions	2009-07-05 19:23:38 -07:00
claw.h
ctcm_dbug.c
ctcm_dbug.h
ctcm_fsms.c	ctcm: avoid wraparound in length of incoming data	2009-03-24 15:24:30 -07:00
ctcm_fsms.h
ctcm_main.c	drivers: Kill now superfluous ->last_rx stores	2009-09-02 23:07:36 -07:00
ctcm_main.h
ctcm_mpc.c	ctcm: fix minor findings from code analysis tool	2009-03-24 15:24:31 -07:00
ctcm_mpc.h
ctcm_sysfs.c
cu3088.c	s390: remove s390_root_dev_*()	2009-01-06 10:44:34 -08:00
cu3088.h
fsm.c
fsm.h
Kconfig	trivial: Kconfig: .ko is normally not included in module names	2009-06-12 18:01:50 +02:00
lcs.c	net: convert remaining non-symbolic return values in ndo_start_xmit() functions	2009-07-05 19:23:38 -07:00
lcs.h	s390: remove driver_data direct access of struct device	2009-06-15 21:30:28 -07:00
Makefile	qeth: remove EDDP	2009-03-25 00:06:21 -07:00
netiucv.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-09-14 10:37:28 -07:00
qeth_core.h	qeth: Cleanup for cast-type determination.	2009-08-26 17:34:18 -07:00
qeth_core_main.c	qeth: display service_level info only when valid.	2009-08-26 17:34:20 -07:00
qeth_core_mpc.c	qeth: support z/VM VSWITCH Port Isolation	2009-05-20 17:36:50 -07:00
qeth_core_mpc.h	qeth: support z/VM VSWITCH Port Isolation	2009-05-20 17:36:50 -07:00
qeth_core_sys.c	qeth: display "undefined" value of sysfs-attribute "layer2"	2009-08-26 17:34:22 -07:00
qeth_l2_main.c	drivers: Kill now superfluous ->last_rx stores	2009-09-02 23:07:36 -07:00
qeth_l3.h
qeth_l3_main.c	drivers: Kill now superfluous ->last_rx stores	2009-09-02 23:07:36 -07:00
qeth_l3_sys.c
smsgiucv.c	[S390] proper use of device register	2009-09-11 10:29:45 +02:00
smsgiucv.h