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
..
arch-v10	CRISv10: remove redundant tests on unsigned	2009-06-23 10:05:05 +02:00
arch-v32	Merge branch 'for-linus' of git://www.jni.nu/cris	2009-06-23 10:47:01 -07:00
boot	CRIS: Merge machine dependent boot/compressed and boot/rescue	2009-04-21 11:44:57 +02:00
configs	CRIS: proper defconfig setup	2008-10-13 21:34:55 +02:00
include	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-08-12 17:44:53 -07:00
kernel	KEYS: Add missing linux/tracehook.h #inclusions	2009-09-09 18:30:02 +10:00
mm	Move FAULT_FLAG_xyz into handle_mm_fault() callers	2009-06-21 13:08:22 -07:00
Kconfig	trivial: fix typos/grammar errors in Kconfig texts	2009-03-30 15:22:01 +02:00
Kconfig.debug	[PATCH] arch/cris/Kconfig.debug: use lib/Kconfig.debug	2005-09-05 00:06:19 -07:00
Makefile	CRIS: Merge machine dependent boot/compressed and boot/rescue	2009-04-21 11:44:57 +02:00