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
..
amiga	m68k: cnt reaches -1, not 0	2009-08-26 23:14:49 +02:00
apollo	m68k: apollo core - Kill warn_unused_result warnings	2009-01-12 20:56:35 +01:00
atari	m68k: atari - Rename "mfp" to "st_mfp"	2009-02-22 09:23:02 -08:00
bvme6000	m68k: Kill several external declarations in source files	2009-01-12 20:56:34 +01:00
configs	m68k: Update defconfigs for 2.6.30-rc3	2009-04-22 20:55:12 +02:00
fpsp040	m68k: fix trigraph ignored warning in setox.S	2008-12-28 20:00:05 +01:00
hp300	m68k: hp300 core - Kill warn_unused_result warnings	2009-01-12 20:56:36 +01:00
ifpsp060	Stringify support commas	2008-07-20 17:24:38 -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	locking, m68k/asm-offsets: Rename signal defines	2009-09-01 09:38:03 +02:00
lib	Stringify support commas	2008-07-20 17:24:38 -07:00
mac	m68k: mac - Add SWIM floppy support	2009-03-26 21:15:27 +01:00
math-emu	locking, m68k/asm-offsets: Rename signal defines	2009-09-01 09:38:03 +02:00
mm	Move FAULT_FLAG_xyz into handle_mm_fault() callers	2009-06-21 13:08:22 -07:00
mvme16x	m68k: Kill several external declarations in source files	2009-01-12 20:56:34 +01:00
mvme147	m68k: mvme147 core - Kill warn_unused_result warnings	2009-01-12 20:56:37 +01:00
q40	m68k: Kill several external declarations in source files	2009-01-12 20:56:34 +01:00
sun3	m68k: sun3 core - Kill warn_unused_result warnings	2009-01-12 20:56:38 +01:00
sun3x	m68k: Kill several external declarations in source files	2009-01-12 20:56:34 +01:00
tools/amiga	Convert files to UTF-8 and some cleanups	2007-10-19 23:21:04 +02:00
install.sh	m68k: Add install target	2009-03-26 21:15:26 +01:00
Kconfig	trivial: fix then -> than typos in comments and documentation	2009-01-06 11:28:06 +01:00
Kconfig.debug	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
Makefile	m68k: Add install target	2009-03-26 21:15:26 +01:00