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-aaec2000	[ARM] 4185/2: entry: introduce get_irqnr_preamble and arch_ret_to_user	2007-02-17 15:04:29 +00:00
arch-at91	Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6	2007-07-16 17:48:54 -07:00
arch-cl7500	[ARM] Use new get_irqnr_preamble	2007-05-12 15:25:50 +01:00
arch-clps711x	[ARM] 4185/2: entry: introduce get_irqnr_preamble and arch_ret_to_user	2007-02-17 15:04:29 +00:00
arch-davinci	[ARM] 4432/5: davinci: pin mux support	2007-07-12 09:57:09 +01:00
arch-ebsa110	[ARM] Use new get_irqnr_preamble	2007-05-12 15:25:50 +01:00
arch-ebsa285	[ARM] Use new get_irqnr_preamble	2007-05-12 15:25:50 +01:00
arch-ep93xx	[ARM] Merge remaining IOP code	2007-02-20 10:52:43 +00:00
arch-h720x	[ARM] 4185/2: entry: introduce get_irqnr_preamble and arch_ret_to_user	2007-02-17 15:04:29 +00:00
arch-imx	[ARM] 4373/1: i.MX/MX1 GPIO support implementation	2007-07-12 11:11:39 +01:00
arch-integrator	[ARM] Remove Integrator/CP SMP platform support	2007-05-16 15:35:26 +01:00
arch-iop13xx	iop13xx: surface the iop13xx adma units to the iop-adma driver	2007-07-13 08:06:18 -07:00
arch-iop32x	iop3xx: surface the iop3xx DMA and AAU units to the iop-adma driver	2007-07-13 08:06:19 -07:00
arch-iop33x	iop3xx: surface the iop3xx DMA and AAU units to the iop-adma driver	2007-07-13 08:06:19 -07:00
arch-ixp4xx	USB: pxa2xx_udc: use generic gpio layer	2007-07-12 16:34:42 -07:00
arch-ixp23xx	[ARM] mm 10: allow memory type to be specified with ioremap	2007-05-05 20:59:27 +01:00
arch-ixp2000	[ARM] 4185/2: entry: introduce get_irqnr_preamble and arch_ret_to_user	2007-02-17 15:04:29 +00:00
arch-ks8695	[ARM] 4377/1: KS8695: GPIO driver	2007-07-12 11:12:34 +01:00
arch-l7200	[ARM] 4185/2: entry: introduce get_irqnr_preamble and arch_ret_to_user	2007-02-17 15:04:29 +00:00
arch-lh7a40x	[ARM] 4248/1: lh7a40x: fix missing definitions for get_irqnr_preamble	2007-03-08 13:33:57 +00:00
arch-netx	[ARM] 4329/1: fix position of NETX_SYSTEM_REG	2007-05-03 20:22:49 +01:00
arch-ns9xxx	[ARM] 4301/1: add mach type cc9p9360js	2007-04-21 20:52:30 +01:00
arch-omap	ARM: OMAP: 24xx pinmux updates	2007-05-10 15:51:09 -07:00
arch-pnx4008	[ARM] 4185/2: entry: introduce get_irqnr_preamble and arch_ret_to_user	2007-02-17 15:04:29 +00:00
arch-pxa	USB: pxa2xx_udc: use generic gpio layer	2007-07-12 16:34:42 -07:00
arch-realview	[ARM] Use new get_irqnr_preamble	2007-05-12 15:25:50 +01:00
arch-rpc	[ARM] Use new get_irqnr_preamble	2007-05-12 15:25:50 +01:00
arch-s3c2410	[ARM] 4445/1: ANUBIS: Fix CPLD registers	2007-06-11 09:09:34 +01:00
arch-sa1100	[ARM] Use new get_irqnr_preamble	2007-05-12 15:25:50 +01:00
arch-shark	[ARM] 4185/2: entry: introduce get_irqnr_preamble and arch_ret_to_user	2007-02-17 15:04:29 +00:00
arch-versatile	[ARM] Use new get_irqnr_preamble	2007-05-12 15:25:50 +01:00
hardware	iop3xx: surface the iop3xx DMA and AAU units to the iop-adma driver	2007-07-13 08:06:19 -07:00
mach	[ARM] use __used attribute	2007-05-30 13:15:06 +01:00
plat-s3c24xx	[ARM] 4400/1: S3C24XX: Add high-speed MMC device definition	2007-05-20 20:03:31 +01:00
.gitignore	[ARM] 4216/1: add .gitignore entries for ARM specific files	2007-02-17 11:26:41 +00:00
a.out.h
assembler.h
atomic.h	atomic.h: atomic_add_unless as inline. Remove system.h atomic.h circular dependency	2007-05-08 11:15:20 -07:00
auxvec.h
bitops.h
bug.h
bugs.h
byteorder.h
cache.h
cacheflush.h	[ARM] armv7: add support for asid-tagged VIVT I-cache	2007-05-09 09:50:23 +01:00
checksum.h	[ARM] Improve csum_fold, cleanup csum_tcpudp_magic()	2007-02-06 16:46:46 +00:00
cnt32_to_63.h
cpu-multi32.h
cpu-single.h
cpu.h
cputime.h
current.h
delay.h
device.h	[ARM] Add a reference from struct device to the dma bounce info	2007-02-12 10:28:24 +00:00
div64.h	[NET]: div64_64 consolidate (rev3)	2007-04-25 22:23:33 -07:00
dma-mapping.h	Fix occurrences of "the the "	2007-05-09 08:57:56 +02:00
dma.h
domain.h	[ARM] 4127/1: Flush the prefetch buffer after changing the DACR	2007-02-08 14:49:18 +00:00
dyntick.h
ecard.h	[ARM] ecard: add ecardm_iomap() / ecardm_iounmap()	2007-05-11 17:19:02 +01:00
elf.h	[ARM] 4473/2: Take the HWCAP definitions out of the elf.h file	2007-07-12 16:20:15 +01:00
emergency-restart.h
errno.h
fcntl.h
fiq.h
flat.h
floppy.h
fpstate.h	[ARM] 4111/1: Allow VFP to work with thread migration on SMP	2007-01-25 16:35:29 +00:00
futex.h
glue.h	[ARM] armv7: add support for ARMv7 cores.	2007-05-08 22:55:53 +01:00
gpio.h	[PATCH] GPIO core	2007-02-12 09:48:34 -08:00
hardirq.h
hardware.h
hw_irq.h
hwcap.h	[ARM] 4473/2: Take the HWCAP definitions out of the elf.h file	2007-07-12 16:20:15 +01:00
ide.h
io.h	[ARM] 4388/1: no need for arm/mm mmap range checks for non-mmu	2007-05-20 19:36:14 +01:00
ioctl.h
ioctls.h	[ARM] enable arbitary speed tty ioctls and split input/output speed	2007-05-28 23:07:34 +01:00
ipc.h
ipcbuf.h
irq_regs.h
irq.h
irqflags.h
Kbuild	[ARM] 4473/2: Take the HWCAP definitions out of the elf.h file	2007-07-12 16:20:15 +01:00
kdebug.h	move die notifier handling to common code	2007-05-08 11:15:04 -07:00
kexec.h	kdump/kexec: calculate note size at compile time	2007-05-08 11:15:07 -07:00
kmap_types.h
leds.h
limits.h
linkage.h	[ARM] VFP: fix section mismatch error	2007-06-10 12:22:20 +01:00
local.h
locks.h
mc146818rtc.h
memory.h
mman.h
mmu_context.h	[ARM] ARMv6: add CPU_HAS_ASID configuration	2007-05-17 10:19:23 +01:00
mmu.h	[ARM] ARMv6: add CPU_HAS_ASID configuration	2007-05-17 10:19:23 +01:00
mmzone.h
module.h
msgbuf.h
mtd-xip.h
mutex.h
namei.h
nwflash.h
page-nommu.h
page.h
param.h
parport.h
pci.h	PCI: remove pci_dac_dma_... APIs	2007-07-11 16:02:11 -07:00
percpu.h
pgalloc.h
pgtable-hwdef.h
pgtable-nommu.h	Clean up mostly unused IOSPACE macros	2007-05-08 11:15:13 -07:00
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
proc-fns.h	[ARM] armv7: add support for ARMv7 cores.	2007-05-08 22:55:53 +01:00
processor.h
procinfo.h
ptrace.h	[ARM] 4474/1: Do not check the PSR_F_BIT in valid_user_regs	2007-07-12 16:20:52 +01:00
resource.h
rtc.h
scatterlist.h
sections.h
segment.h
semaphore-helper.h
semaphore.h
sembuf.h
serial.h
setup.h	[ARM] use __used attribute	2007-05-30 13:15:06 +01:00
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h
sizes.h	[ARM] 4372/1: Define byte sizes in asm-arm/sizes.h	2007-05-11 21:07:58 +01:00
smp.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
spinlock_types.h
spinlock.h	[PATCH] Remove the last reference to rwlock_is_locked() macro.	2007-02-11 10:51:34 -08:00
stat.h
statfs.h
string.h
suspend.h
system.h	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2007-05-09 13:05:57 -07:00
termbits.h	[ARM] enable arbitary speed tty ioctls and split input/output speed	2007-05-28 23:07:34 +01:00
termios.h	[ARM] enable arbitary speed tty ioctls and split input/output speed	2007-05-28 23:07:34 +01:00
therm.h
thread_info.h	[ARM] Move syscall saving out of the way of utrace	2007-05-06 13:56:26 +01:00
thread_notify.h
timex.h
tlb.h
tlbflush.h	[ARM] 4394/1: ARMv7: Add the TLB range operations	2007-05-30 14:32:07 +01:00
topology.h
traps.h
types.h
uaccess.h	Storage class should be before const qualifier	2007-02-17 20:11:19 +01:00
ucontext.h
unaligned.h
unistd.h	Introduce fixed sys_sync_file_range2() syscall, implement on PowerPC and ARM	2007-06-28 11:38:30 -07:00
user.h
vfp.h
vfpmacros.h
vga.h
xor.h