Linus Torvalds 1f1c2881f6 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 ... * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (37 commits) forcedeth bug fix: realtek phy forcedeth bug fix: vitesse phy forcedeth bug fix: cicada phy atl1: reorder atl1_main functions atl1: fix excessively indented code atl1: cleanup atl1_main atl1: header file cleanup atl1: remove irq_sem cdc-subset to support new vendor/product ID 8139cp: implement the missing dev->tx_timeout myri10ge: Remove nonsensical limit in the tx done routine gianfar: kill unused header EP93XX_ETH must select MII macb: Add multicast capability macb: Use generic PHY layer s390: add barriers to qeth driver s390: scatter-gather for inbound traffic in qeth driver eHEA: Introducing support vor DLPAR memory add Fix a potential NULL pointer dereference in free_shared_mem() in drivers/net/s2io.c [PATCH] softmac: Fix ESSID problem ...		2007-07-16 17:48:54 -07:00
..
arch-at32ap	macb: Use generic PHY layer	2007-07-16 18:28:04 -04:00
mach	[PATCH] atmel_serial: Rename at91_register_uart_fns	2006-10-04 10:25:05 -07:00
a.out.h
addrspace.h
asm.h
atomic.h	avr32: remove unneeded cast in atomic.h	2007-04-27 13:54:02 +02:00
auxvec.h
bitops.h
bug.h	[AVR32] Clean up exception handling code	2007-04-27 13:44:13 +02:00
bugs.h
byteorder.h
cache.h	[AVR32] Define ARCH_KMALLOC_MINALIGN to L1_CACHE_BYTES	2007-06-14 18:30:50 +02:00
cachectl.h
cacheflush.h	[PATCH] Optimize D-cache alias handling on fork	2006-12-13 09:27:08 -08:00
checksum.h	Remove a couple final references to obsolete verify_area().	2007-02-09 15:01:56 +01:00
cputime.h
current.h
delay.h
device.h	Driver core: add dev_archdata to struct device	2006-12-01 14:52:01 -08:00
div64.h
dma-mapping.h	avr32: dma-mapping.h	2007-03-07 10:50:30 +01:00
dma.h
elf.h
emergency-restart.h
errno.h
fcntl.h
futex.h
gpio.h	[AVR32] GPIO API implementation	2007-02-09 15:01:58 +01:00
hardirq.h
hw_irq.h
intc.h
io.h	[AVR32] Use memcpy/memset in memcpy_{from,to}_io and memset_io	2007-04-27 13:44:15 +02:00
ioctl.h
ioctls.h
ipcbuf.h
irq.h	[AVR32] GPIO API implementation	2007-02-09 15:01:58 +01:00
irq_regs.h	[PATCH] IRQ: Fix AVR32 breakage	2006-10-11 11:14:14 -07:00
irqflags.h
Kbuild	[AVR32] Fix typo in include/asm-avr32/Kbuild	2007-03-07 10:50:27 +01:00
kdebug.h	[AVR32] optimize pagefault path	2007-05-13 17:07:46 +02:00
kmap_types.h
kprobes.h	[AVR32] optimize pagefault path	2007-05-13 17:07:46 +02:00
linkage.h
local.h
mman.h
mmu.h
mmu_context.h	[PATCH] x86: PARAVIRT: add hooks to intercept mm creation and destruction	2007-05-02 19:27:14 +02:00
module.h
msgbuf.h
mutex.h
namei.h
numnodes.h
ocd.h
page.h
param.h
pci.h
percpu.h
pgalloc.h	[PATCH] getting rid of all casts of k[cmz]alloc() calls	2006-12-13 09:05:58 -08:00
pgtable-2level.h
pgtable.h	page table handling cleanup	2007-07-16 09:05:36 -07:00
poll.h	Consolidate asm/poll.h	2007-05-11 08:29:34 -07:00
posix_types.h	[AVR32] ssize_t should be long, not int	2007-02-09 15:01:59 +01:00
processor.h	[AVR32] Clean up exception handling code	2007-04-27 13:44:13 +02:00
ptrace.h
resource.h
scatterlist.h	PCI: scatterlist.h needs types.h	2007-05-02 19:02:34 -07:00
sections.h
semaphore.h
sembuf.h
setup.h	[AVR32] Fix section mismatch .taglist -> .init.text	2007-05-09 09:26:18 +02:00
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h
socket.h	[NET]: Adding SO_TIMESTAMPNS / SCM_TIMESTAMPNS support	2007-04-25 22:24:21 -07:00
sockios.h	[NET]: Introduce SIOCGSTAMPNS ioctl to get timestamps with nanosec resolution	2007-04-25 22:24:04 -07:00
stat.h
statfs.h
string.h
sysreg.h	[AVR32] Clean up asm/sysreg.h	2007-04-27 13:44:13 +02:00
system.h	[AVR32] Clean up exception handling code	2007-04-27 13:44:13 +02:00
termbits.h	lots-of-architectures: enable arbitary speed tty support	2007-07-10 17:51:13 -07:00
termios.h	[PATCH] consolidate line discipline number definitions	2007-02-11 10:51:26 -08:00
thread_info.h	[AVR32] Put cpu in sleep 0 when idle.	2007-04-27 13:44:12 +02:00
timex.h
tlb.h
tlbflush.h
topology.h
traps.h
types.h	[PATCH] Centralise definitions of sector_t and blkcnt_t	2006-12-04 19:41:15 -08:00
uaccess.h	[AVR32] Fix compile error with gcc 4.1	2007-04-27 14:21:47 +02:00
ucontext.h
unaligned.h
unistd.h	[AVR32] Wire up signalfd, timerfd and eventfd	2007-05-13 17:07:57 +02:00
user.h