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
..
boot	inflate: refactor inflate malloc code	2008-07-25 10:53:28 -07:00
configs	MN10300: Update the ASB2303 defconfig	2009-04-24 07:47:59 -07:00
include/asm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-09-14 10:37:28 -07:00
kernel	KEYS: Add a keyctl to install a process's session keyring on its parent [try #6]	2009-09-02 21:29:22 +10:00
lib	mn10300: provide __ucmpdi2() for MN10300	2008-07-04 10:40:07 -07:00
mm	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
oprofile	MN10300: Kill MN10300's own profiling Kconfig	2009-04-09 10:53:16 -07:00
proc-mn103e010	Separate out the proc- and unit-specific header directories from the general	2009-04-10 14:33:48 +01:00
unit-asb2303	Separate out the proc- and unit-specific header directories from the general	2009-04-10 14:33:48 +01:00
unit-asb2305	Separate out the proc- and unit-specific header directories from the general	2009-04-10 14:33:48 +01:00
Kconfig	MN10300: Add utrace/tracehooks support	2009-06-11 09:02:20 -07:00
Kconfig.debug	MN10300: Add built-in testing for misalignment handler	2008-11-12 10:41:17 -08:00
Makefile	Separate out the proc- and unit-specific header directories from the general	2009-04-10 14:33:48 +01:00