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
..
appldata	[S390] pm: appldata power management callbacks	2009-06-16 10:31:15 +02:00
boot	[PATCH] use ${CROSS_COMPILE}installkernel in arch/*/boot/install.sh	2005-06-23 09:45:07 -07:00
crypto	crypto: sha-s390 - Fix warnings in import function	2009-09-05 16:27:35 +10:00
hypfs	[S390] hypfs: Use "%u" instead of "%d" for unsigned ints in snprintf	2009-09-11 10:29:51 +02: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 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-09-11 13:24:03 -07:00
kvm	Merge branch 'kvm-updates/2.6.31' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2009-08-09 14:58:21 -07:00
lib	[S390] add __ucmpdi2() helper function	2009-07-07 16:37:53 +02:00
math-emu	[S390] remove -traditional	2008-04-30 13:38:44 +02:00
mm	[S390] Wire up page fault events for software perf counters.	2009-09-11 10:29:56 +02:00
oprofile	Combine instrumentation menus in kernel/Kconfig.instrumentation	2007-10-19 11:53:54 -07:00
defconfig	tracing: Rename FTRACE_SYSCALLS for tracepoints	2009-08-26 00:17:35 +02:00
Kconfig	Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-09-11 13:24:03 -07:00
Kconfig.debug	generic debug pagealloc: build fix	2009-04-02 19:04:48 -07:00
Makefile	[S390] hibernation: merge files and move to kernel/	2009-09-11 10:29:45 +02:00