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
..
mach
addrspace.h
asm.h
atomic.h	asm-generic: rename atomic.h to atomic-long.h	2009-06-11 21:02:17 +02:00
auxvec.h
bitops.h	avr32: define __fls	2009-01-01 10:12:16 +10:30
bitsperlong.h	asm-generic: introduce asm/bitsperlong.h	2009-06-11 21:02:14 +02:00
bug.h
bugs.h
byteorder.h	byteorder: make swab.h include asm/swab.h like a regular header	2009-01-14 19:56:50 -08:00
cache.h
cachectl.h
cacheflush.h
checksum.h
cputime.h
current.h
delay.h
device.h
div64.h
dma-mapping.h
dma.h
elf.h	[PATCH] remove unused ibcs2/PER_SVR4 in SET_PERSONALITY	2008-10-16 15:40:05 +02:00
emergency-restart.h
errno.h
fb.h
fcntl.h
ftrace.h	tracing: make CALLER_ADDRx overwriteable	2009-03-02 16:49:37 -05:00
futex.h
gpio.h
hardirq.h	preempt-count: force hardirq-count to max of 10	2009-02-12 11:19:05 -05:00
hw_irq.h	avr32: remove obsolete hw_interrupt_type	2009-05-13 16:53:48 +02:00
io.h	avr32: Implement {read,write}[bwl]_be	2008-10-08 18:44:57 +02:00
ioctl.h
ioctls.h
ipcbuf.h
irq_regs.h
irq.h
irqflags.h
Kbuild	byteorder: make swab.h include asm/swab.h like a regular header	2009-01-14 19:56:50 -08:00
kdebug.h	avr32: Define DIE_OOPS	2009-01-07 10:40:30 +01:00
kmap_types.h
kprobes.h
linkage.h
local.h
mman.h	asm-generic: rename termios.h, signal.h and mman.h	2009-06-11 21:01:52 +02:00
mmu_context.h
mmu.h
module.h
msgbuf.h
mutex.h
numnodes.h
ocd.h
page.h
param.h
pci.h
percpu.h
pgalloc.h	mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()	2009-07-27 12:10:38 -07:00
pgtable-2level.h
pgtable.h
poll.h
posix_types.h
processor.h
ptrace.h
resource.h
scatterlist.h
sections.h
sembuf.h
serial.h
setup.h
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h	asm-generic: rename termios.h, signal.h and mman.h	2009-06-11 21:01:52 +02:00
socket.h	net: implement a SO_DOMAIN getsockoption	2009-08-05 13:02:57 -07:00
sockios.h
stat.h
statfs.h
string.h
swab.h	headers_check fix: avr32, swab.h	2009-02-01 11:01:23 +05:30
syscalls.h	avr32: Move syscalls.h under arch/avr32/include/asm/	2009-01-07 11:28:15 +01:00
sysreg.h
system.h
termbits.h
termios.h	asm-generic: rename termios.h, signal.h and mman.h	2009-06-11 21:01:52 +02:00
thread_info.h	KEYS: Extend TIF_NOTIFY_RESUME to (almost) all architectures [try #6]	2009-09-02 21:29:19 +10:00
timex.h
tlb.h
tlbflush.h
topology.h
traps.h
types.h
uaccess.h	avr32: fix out-of-range rjmp instruction on large kernels	2009-01-16 09:38:05 +01:00
ucontext.h
unaligned.h
unistd.h
user.h
xor.h