Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2026-09-18 18:15:59 +00:00 · 2008-08-27 15:29:46 +10:00 · 2008-08-27 15:29:46 +10:00 · 09bf825e8e
commit 09bf825e8e
parent e3c2ced8d2 c2d4254577
754 changed files with 25669 additions and 22023 deletions
--- a/Documentation/arm/Samsung-S3C24XX/GPIO.txt
+++ b/Documentation/arm/Samsung-S3C24XX/GPIO.txt
--- a/Documentation/arm/Samsung-S3C24XX/Overview.txt
+++ b/Documentation/arm/Samsung-S3C24XX/Overview.txt
--- a/Documentation/filesystems/ubifs.txt
+++ b/Documentation/filesystems/ubifs.txt
--- a/Documentation/hwmon/ibmaem
+++ b/Documentation/hwmon/ibmaem
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/scsi/ChangeLog.megaraid_sas
+++ b/Documentation/scsi/ChangeLog.megaraid_sas
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
--- a/Documentation/vm/page_migration
+++ b/Documentation/vm/page_migration
--- a/109
+++ b/109
--- a/2
+++ b/2
--- a/arch/alpha/include/asm/8253pit.h
+++ b/arch/alpha/include/asm/8253pit.h
--- a/arch/alpha/include/asm/Kbuild
+++ b/arch/alpha/include/asm/Kbuild
--- a/arch/alpha/include/asm/a.out-core.h
+++ b/arch/alpha/include/asm/a.out-core.h
--- a/arch/alpha/include/asm/a.out.h
+++ b/arch/alpha/include/asm/a.out.h
--- a/arch/alpha/include/asm/agp.h
+++ b/arch/alpha/include/asm/agp.h
--- a/arch/alpha/include/asm/agp_backend.h
+++ b/arch/alpha/include/asm/agp_backend.h
--- a/arch/alpha/include/asm/atomic.h
+++ b/arch/alpha/include/asm/atomic.h
--- a/arch/alpha/include/asm/auxvec.h
+++ b/arch/alpha/include/asm/auxvec.h
--- a/arch/alpha/include/asm/barrier.h
+++ b/arch/alpha/include/asm/barrier.h
--- a/arch/alpha/include/asm/bitops.h
+++ b/arch/alpha/include/asm/bitops.h
--- a/arch/alpha/include/asm/bug.h
+++ b/arch/alpha/include/asm/bug.h
--- a/arch/alpha/include/asm/bugs.h
+++ b/arch/alpha/include/asm/bugs.h
--- a/arch/alpha/include/asm/byteorder.h
+++ b/arch/alpha/include/asm/byteorder.h
--- a/arch/alpha/include/asm/cache.h
+++ b/arch/alpha/include/asm/cache.h
--- a/arch/alpha/include/asm/cacheflush.h
+++ b/arch/alpha/include/asm/cacheflush.h
--- a/arch/alpha/include/asm/checksum.h
+++ b/arch/alpha/include/asm/checksum.h
--- a/arch/alpha/include/asm/compiler.h
+++ b/arch/alpha/include/asm/compiler.h
--- a/arch/alpha/include/asm/console.h
+++ b/arch/alpha/include/asm/console.h
--- a/arch/alpha/include/asm/core_apecs.h
+++ b/arch/alpha/include/asm/core_apecs.h
--- a/arch/alpha/include/asm/core_cia.h
+++ b/arch/alpha/include/asm/core_cia.h
--- a/arch/alpha/include/asm/core_irongate.h
+++ b/arch/alpha/include/asm/core_irongate.h
--- a/arch/alpha/include/asm/core_lca.h
+++ b/arch/alpha/include/asm/core_lca.h
--- a/arch/alpha/include/asm/core_marvel.h
+++ b/arch/alpha/include/asm/core_marvel.h
--- a/arch/alpha/include/asm/core_mcpcia.h
+++ b/arch/alpha/include/asm/core_mcpcia.h
--- a/arch/alpha/include/asm/core_polaris.h
+++ b/arch/alpha/include/asm/core_polaris.h
--- a/arch/alpha/include/asm/core_t2.h
+++ b/arch/alpha/include/asm/core_t2.h
--- a/arch/alpha/include/asm/core_titan.h
+++ b/arch/alpha/include/asm/core_titan.h
--- a/arch/alpha/include/asm/core_tsunami.h
+++ b/arch/alpha/include/asm/core_tsunami.h
--- a/arch/alpha/include/asm/core_wildfire.h
+++ b/arch/alpha/include/asm/core_wildfire.h
--- a/arch/alpha/include/asm/cputime.h
+++ b/arch/alpha/include/asm/cputime.h
--- a/arch/alpha/include/asm/current.h
+++ b/arch/alpha/include/asm/current.h
--- a/arch/alpha/include/asm/delay.h
+++ b/arch/alpha/include/asm/delay.h
--- a/arch/alpha/include/asm/device.h
+++ b/arch/alpha/include/asm/device.h
--- a/arch/alpha/include/asm/div64.h
+++ b/arch/alpha/include/asm/div64.h
--- a/arch/alpha/include/asm/dma-mapping.h
+++ b/arch/alpha/include/asm/dma-mapping.h
--- a/arch/alpha/include/asm/dma.h
+++ b/arch/alpha/include/asm/dma.h
--- a/arch/alpha/include/asm/elf.h
+++ b/arch/alpha/include/asm/elf.h
--- a/arch/alpha/include/asm/emergency-restart.h
+++ b/arch/alpha/include/asm/emergency-restart.h
--- a/arch/alpha/include/asm/err_common.h
+++ b/arch/alpha/include/asm/err_common.h
--- a/arch/alpha/include/asm/err_ev6.h
+++ b/arch/alpha/include/asm/err_ev6.h
--- a/arch/alpha/include/asm/err_ev7.h
+++ b/arch/alpha/include/asm/err_ev7.h
--- a/arch/alpha/include/asm/errno.h
+++ b/arch/alpha/include/asm/errno.h
--- a/arch/alpha/include/asm/fb.h
+++ b/arch/alpha/include/asm/fb.h
--- a/arch/alpha/include/asm/fcntl.h
+++ b/arch/alpha/include/asm/fcntl.h
--- a/arch/alpha/include/asm/floppy.h
+++ b/arch/alpha/include/asm/floppy.h
--- a/arch/alpha/include/asm/fpu.h
+++ b/arch/alpha/include/asm/fpu.h
--- a/arch/alpha/include/asm/futex.h
+++ b/arch/alpha/include/asm/futex.h
--- a/arch/alpha/include/asm/gct.h
+++ b/arch/alpha/include/asm/gct.h
--- a/arch/alpha/include/asm/gentrap.h
+++ b/arch/alpha/include/asm/gentrap.h
--- a/arch/alpha/include/asm/hardirq.h
+++ b/arch/alpha/include/asm/hardirq.h
--- a/arch/alpha/include/asm/hw_irq.h
+++ b/arch/alpha/include/asm/hw_irq.h
--- a/arch/alpha/include/asm/hwrpb.h
+++ b/arch/alpha/include/asm/hwrpb.h
--- a/arch/alpha/include/asm/io.h
+++ b/arch/alpha/include/asm/io.h
--- a/arch/alpha/include/asm/io_trivial.h
+++ b/arch/alpha/include/asm/io_trivial.h
--- a/arch/alpha/include/asm/ioctl.h
+++ b/arch/alpha/include/asm/ioctl.h
--- a/arch/alpha/include/asm/ioctls.h
+++ b/arch/alpha/include/asm/ioctls.h
--- a/arch/alpha/include/asm/ipcbuf.h
+++ b/arch/alpha/include/asm/ipcbuf.h
--- a/arch/alpha/include/asm/irq.h
+++ b/arch/alpha/include/asm/irq.h
--- a/arch/alpha/include/asm/irq_regs.h
+++ b/arch/alpha/include/asm/irq_regs.h
--- a/arch/alpha/include/asm/jensen.h
+++ b/arch/alpha/include/asm/jensen.h
--- a/arch/alpha/include/asm/kdebug.h
+++ b/arch/alpha/include/asm/kdebug.h
--- a/arch/alpha/include/asm/kmap_types.h
+++ b/arch/alpha/include/asm/kmap_types.h
--- a/arch/alpha/include/asm/linkage.h
+++ b/arch/alpha/include/asm/linkage.h
--- a/arch/alpha/include/asm/local.h
+++ b/arch/alpha/include/asm/local.h
--- a/arch/alpha/include/asm/machvec.h
+++ b/arch/alpha/include/asm/machvec.h
--- a/arch/alpha/include/asm/mc146818rtc.h
+++ b/arch/alpha/include/asm/mc146818rtc.h
--- a/arch/alpha/include/asm/md.h
+++ b/arch/alpha/include/asm/md.h
--- a/arch/alpha/include/asm/mman.h
+++ b/arch/alpha/include/asm/mman.h
--- a/arch/alpha/include/asm/mmu.h
+++ b/arch/alpha/include/asm/mmu.h
--- a/arch/alpha/include/asm/mmu_context.h
+++ b/arch/alpha/include/asm/mmu_context.h
--- a/arch/alpha/include/asm/mmzone.h
+++ b/arch/alpha/include/asm/mmzone.h
--- a/arch/alpha/include/asm/module.h
+++ b/arch/alpha/include/asm/module.h
--- a/arch/alpha/include/asm/msgbuf.h
+++ b/arch/alpha/include/asm/msgbuf.h
--- a/arch/alpha/include/asm/mutex.h
+++ b/arch/alpha/include/asm/mutex.h
--- a/arch/alpha/include/asm/page.h
+++ b/arch/alpha/include/asm/page.h
--- a/arch/alpha/include/asm/pal.h
+++ b/arch/alpha/include/asm/pal.h
--- a/arch/alpha/include/asm/param.h
+++ b/arch/alpha/include/asm/param.h
--- a/arch/alpha/include/asm/parport.h
+++ b/arch/alpha/include/asm/parport.h
--- a/arch/alpha/include/asm/pci.h
+++ b/arch/alpha/include/asm/pci.h
--- a/arch/alpha/include/asm/percpu.h
+++ b/arch/alpha/include/asm/percpu.h
--- a/arch/alpha/include/asm/pgalloc.h
+++ b/arch/alpha/include/asm/pgalloc.h
--- a/arch/alpha/include/asm/pgtable.h
+++ b/arch/alpha/include/asm/pgtable.h
--- a/arch/alpha/include/asm/poll.h
+++ b/arch/alpha/include/asm/poll.h
--- a/arch/alpha/include/asm/posix_types.h
+++ b/arch/alpha/include/asm/posix_types.h
--- a/arch/alpha/include/asm/processor.h
+++ b/arch/alpha/include/asm/processor.h
--- a/arch/alpha/include/asm/ptrace.h
+++ b/arch/alpha/include/asm/ptrace.h
--- a/arch/alpha/include/asm/reg.h
+++ b/arch/alpha/include/asm/reg.h
--- a/arch/alpha/include/asm/regdef.h
+++ b/arch/alpha/include/asm/regdef.h
--- a/arch/alpha/include/asm/resource.h
+++ b/arch/alpha/include/asm/resource.h
--- a/arch/alpha/include/asm/rtc.h
+++ b/arch/alpha/include/asm/rtc.h
--- a/Show more
+++ b/Show more