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
..
configs	sgi-gru: remove SGI_GRU as a valid config option for ia64 configs with SGI_UV	2009-04-02 19:05:07 -07:00
dig	x86, ia64: convert to use generic dma_map_ops struct	2009-01-06 14:06:57 +01:00
hp	net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions	2009-07-05 19:16:04 -07:00
ia32	generic compat_sys_ustat	2009-03-27 14:43:57 -04: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	Merge branch 'next' into for-linus	2009-09-11 08:04:49 +10:00
kvm	KVM: ia64: fix build failures due to ia64/unsigned long mismatches	2009-08-05 15:04:16 +03:00
lib	[IA64] fix csum_ipv6_magic()	2009-09-02 09:14:48 -07:00
mm	Move FAULT_FLAG_xyz into handle_mm_fault() callers	2009-06-21 13:08:22 -07:00
oprofile	oprofile: more whitespace fixes	2008-10-15 20:55:51 +02:00
pci	ia64/PCI: adjust section annotation for pcibios_setup()	2009-06-30 16:26:53 -07:00
scripts	ia64/pv_ops/pvchecker: support mov = ar.itc paravirtualization	2009-03-26 10:50:09 -07:00
sn	[IA64] sprintf should not be used with same source & destination address	2009-06-30 14:02:00 -07:00
uv	[IA64] Simplify SGI uv vs. sn2 driver issues	2008-11-04 11:29:39 -08:00
xen	rcu: Simplify rcu_pending()/rcu_check_callbacks() API	2009-08-23 10:32:39 +02:00
install.sh	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
Kconfig	dma-mapping: ia64: add CONFIG_DMA_API_DEBUG support	2009-06-18 13:03:58 -07:00
Kconfig.debug	[PATCH] Move Kprobes and Oprofile to "Instrumentation Support" menu	2005-11-07 07:53:35 -08:00
Makefile	arch/ia64/Makefile: Remove -mtune=merced in IA64 kernel build	2009-08-11 14:52:11 -07:00
module.lds	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00