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
..
boards	sh: use in-soc KEYSC on se7724	2009-08-15 12:58:47 +09:00
boot	sh: Merge the split arch/sh/boot/compressed/ Makefiles.	2009-05-10 00:58:21 +09:00
cchips	sh: mach-hp6xx: Fix up the hp6xx build for hd64461 changes.	2009-05-20 11:27:13 +09:00
configs	sh: re-add LCDC fbdev support to the Migo-R defconfig	2009-07-01 15:31:33 +09:00
drivers	sh: pci: Initial PCI-Express support for SH7786 Urquell board.	2009-06-17 18:20:48 +09:00
include	net: sh_eth: add value of ether_link pin in platform_data	2009-08-29 00:19:35 -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	sh: Handle calling csum_partial with misaligned data	2009-01-29 11:56:02 +09:00
lib64	sh: Convert sh64 to use the generic checksum code.	2009-06-15 00:00:42 +09:00
math-emu	sh: Fix up the math-emu build.	2007-06-11 15:57:42 +09:00
mm	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
oprofile	sh: Add support for SH7724 (SH-Mobile R2R) CPU subtype.	2009-04-16 14:40:56 +09:00
tools	sh: Record ms7724se in mach-types.	2009-05-26 17:02:18 +09:00
Kconfig	sh: Fix up HAVE_PERF_COUNTERS typo.	2009-06-24 01:41:05 +09:00
Kconfig.cpu	sh: Tidy up SH-4A boot_cpu_data.flags probing.	2009-06-01 19:50:08 +09:00
Kconfig.debug	sh: Kill off unused DEBUG_BOOTMEM symbol.	2009-06-25 21:17:19 +09:00
Makefile	sh: plug vsyscall dir in to archclean.	2009-06-10 09:48:33 +03:00