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
..
dec	…
emma	MIPS: Eleminate filenames from comments	2009-08-03 17:52:40 +01:00
fw	…
ip32	…
lasat	…
mach-ar7	MIPS: Add support for Texas Instruments AR7 System-on-a-Chip	2009-07-03 15:45:23 +01:00
mach-au1x00	MIPS: Alchemy: Rewrite GPIO support.	2009-06-17 11:06:28 +01:00
mach-bcm47xx	MIPS: BCM47xx: Fix gpio_direction_output	2009-06-17 11:06:28 +01:00
mach-cavium-octeon	MIPS: Move Cavium CP0 hwrena impl bits to cpu-feature-overrides.h	2009-06-17 11:06:31 +01:00
mach-cobalt	Update Yoichi Yuasa's e-mail address	2009-07-03 15:45:29 +01:00
mach-db1x00	…
mach-dec	…
mach-emma2rh	…
mach-excite	…
mach-generic	MIPS: Pass struct device to plat_dma_addr_to_phys()	2009-06-17 11:06:24 +01:00
mach-ip22	…
mach-ip27	MIPS: Pass struct device to plat_dma_addr_to_phys()	2009-06-17 11:06:24 +01:00
mach-ip28	…
mach-ip32	MIPS: Pass struct device to plat_dma_addr_to_phys()	2009-06-17 11:06:24 +01:00
mach-jazz	MIPS: Pass struct device to plat_dma_addr_to_phys()	2009-06-17 11:06:24 +01:00
mach-lasat	…
mach-lemote	MIPS: Pass struct device to plat_dma_addr_to_phys()	2009-06-17 11:06:24 +01:00
mach-malta	…
mach-mipssim	…
mach-pb1x00	…
mach-pnx833x	…
mach-pnx8550	…
mach-rc32434	MIPS: RB532: Cleanup cpu-features-overrides	2009-06-17 11:06:26 +01:00
mach-rm	…
mach-sibyte	…
mach-tx39xx	…
mach-tx49xx	…
mach-vr41xx	…
mach-wrppmc	…
mach-yosemite	…
mips-boards	…
octeon	MIPS: Reorganize Cavium OCTEON PCI support.	2009-07-03 15:45:29 +01:00
pci	…
pmc-sierra/msp71xx	MIPS: MSPxxxx: define MIPS34K_MISSED_ITLB_WAR for other PMC-Sierra SoC	2009-08-03 17:52:43 +01:00
sgi	…
sibyte	…
sn	MIPS: Build fix - include <linux/smp.h> into all smp_processor_id() users.	2009-06-24 18:34:39 +01:00
txx9	MIPS: TXx9: Add TX4939 RNG support	2009-06-17 11:06:27 +01:00
vr41xx	Update Yoichi Yuasa's e-mail address	2009-07-03 15:45:29 +01:00
xtalk	…
Kbuild	…
abi.h	…
addrspace.h	…
amon.h	MIPS: CMP: activate CMP support	2009-07-03 15:45:26 +01:00
asm.h	…
asmmacro-32.h	…
asmmacro-64.h	…
asmmacro.h	…
atomic.h	…
auxvec.h	…
barrier.h	…
bcache.h	…
bitops.h	…
bitsperlong.h	…
bootinfo.h	…
branch.h	…
break.h	…
bug.h	MIPS: bug.h Build fix - include <linux/compiler.h>.	2009-06-24 18:34:38 +01:00
bugs.h	MIPS: Build fix - include <linux/smp.h> into all smp_processor_id() users.	2009-06-24 18:34:39 +01:00
byteorder.h	…
cache.h	…
cachectl.h	…
cacheflush.h	…
cacheops.h	…
cevt-r4k.h	…
checksum.h	…
cmp.h	…
cmpxchg.h	…
compat-signal.h	…
compat.h	…
compiler.h	…
cpu-features.h	MIPS: Allow CPU specific overriding of CP0 hwrena impl bits.	2009-06-17 11:06:31 +01:00
cpu-info.h	…
cpu.h	…
cputime.h	…
current.h	…
debug.h	…
delay.h	MIPS: Fix typo resulting in far too long ndelay times.	2009-06-17 11:06:23 +01:00
device.h	…
div64.h	…
dma-mapping.h	…
dma.h	…
ds1287.h	Update Yoichi Yuasa's e-mail address	2009-07-03 15:45:29 +01:00
dsp.h	…
edac.h	…
elf.h	MIPS: 64-bit: Fix o32 core dump	2009-07-03 15:45:27 +01:00
emergency-restart.h	…
errno.h	…
fb.h	…
fcntl.h	…
fixmap.h	…
floppy.h	…
fpregdef.h	…
fpu.h	…
fpu_emulator.h	…
ftrace.h	…
futex.h	…
gcmpregs.h	MIPS: CMP: Move gcmp_probe to before the SMP ops	2009-07-03 15:45:26 +01:00
gic.h	MIPS: Fix compile for !CONFIG_SMP	2009-08-03 17:52:40 +01:00
gpio.h	…
gt64120.h	…
hardirq.h	…
hazards.h	…
highmem.h	…
hugetlb.h	MIPS: Add support files for hugetlbfs.	2009-06-17 11:06:30 +01:00
hw_irq.h	…
i8253.h	…
i8259.h	…
ide.h	…
inst.h	…
io.h	…
ioctl.h	MIPS: ioctl.h: Cleanup.	2009-06-17 11:06:28 +01:00
ioctls.h	…
ipcbuf.h	…
irq.h	MIPS: Build fix - include <linux/smp.h> into all smp_processor_id() users.	2009-06-24 18:34:39 +01:00
irq_cpu.h	…
irq_gt641xx.h	Update Yoichi Yuasa's e-mail address	2009-07-03 15:45:29 +01:00
irq_regs.h	…
irqflags.h	…
isadep.h	…
jazz.h	…
jazzdma.h	…
kdebug.h	…
kexec.h	…
kgdb.h	…
kmap_types.h	kmap_types: make most arches use generic header file	2009-06-16 19:47:51 -07:00
kspd.h	…
linkage.h	…
local.h	…
m48t37.h	…
mc146818-time.h	…
mc146818rtc.h	…
mips_mt.h	…
mipsmtregs.h	…
mipsprom.h	…
mipsregs.h	MIPS: Add hugetlbfs page defines.	2009-06-17 11:06:30 +01:00
mman.h	…
mmu.h	…
mmu_context.h	MIPS: Build fix - include <linux/smp.h> into all smp_processor_id() users.	2009-06-24 18:34:39 +01:00
mmzone.h	…
module.h	…
msc01_ic.h	…
msgbuf.h	…
mutex.h	…
nile4.h	…
paccess.h	…
page.h	MIPS: Fix HPAGE_SIZE redefinition	2009-08-17 17:27:57 +01:00
param.h	…
parport.h	…
pci.h	Delete pcibios_select_root	2009-06-17 14:04:42 -07:00
percpu.h	…
pgalloc.h	mm: Remove duplicate definitions in MIPS and SH	2009-07-27 17:26:44 -07:00
pgtable-32.h	…
pgtable-64.h	…
pgtable-bits.h	MIPS: Add hugetlbfs page defines.	2009-06-17 11:06:30 +01:00
pgtable.h	MIPS: Add hugetlbfs page defines.	2009-06-17 11:06:30 +01:00
pmon.h	…
poll.h	…
posix_types.h	…
prefetch.h	…
processor.h	MIPS: Avoid clobbering struct pt_regs in kthreads	2009-08-03 17:52:41 +01:00
ptrace.h	…
r4k-timer.h	…
r4kcache.h	MIPS: Support 64-byte D-cache line size	2009-06-17 11:06:24 +01:00
reboot.h	…
reg.h	MIPS: 64-bit: Fix o32 core dump	2009-07-03 15:45:27 +01:00
regdef.h	…
resource.h	…
rm9k-ocd.h	…
rtlx.h	…
scatterlist.h	…
seccomp.h	…
sections.h	…
segment.h	…
sembuf.h	…
serial.h	…
setup.h	…
sgialib.h	…
sgiarcs.h	…
sgidefs.h	…
shmbuf.h	…
shmparam.h	…
sigcontext.h	…
siginfo.h	…
signal.h	…
sim.h	…
smp-ops.h	MIPS: Add arch generic CPU hotplug	2009-06-24 18:34:40 +01:00
smp.h	MIPS: Cavium: Add CPU hotplugging code.	2009-06-24 18:34:40 +01:00
smtc.h	…
smtc_ipi.h	…
smtc_proc.h	…
smvp.h	…
sni.h	…
socket.h	net: implement a SO_DOMAIN getsockoption	2009-08-05 13:02:57 -07:00
sockios.h	…
sparsemem.h	…
spinlock.h	…
spinlock_types.h	…
stackframe.h	…
stacktrace.h	…
stat.h	…
statfs.h	…
string.h	…
suspend.h	MIPS: Add hibernation support	2009-06-17 11:06:31 +01:00
swab.h	MIPS: Define __arch_swab64 for all mips r2 cpus	2009-07-03 15:45:25 +01:00
sysmips.h	…
system.h	…
termbits.h	…
termios.h	…
thread_info.h	KEYS: Extend TIF_NOTIFY_RESUME to (almost) all architectures [try #6]	2009-09-02 21:29:19 +10:00
time.h	…
timex.h	…
titan_dep.h	…
tlb.h	…
tlbdebug.h	…
tlbflush.h	…
topology.h	…
traps.h	…
txx9irq.h	…
txx9pio.h	…
txx9tmr.h	…
types.h	…
uaccess.h	…
ucontext.h	…
unaligned.h	…
unistd.h	MIPS: Wire up accept4 syscall.	2009-08-03 17:52:50 +01:00
user.h	…
vga.h	…
vpe.h	…
war.h	…
watch.h	…
wbflush.h	…
xor.h	…