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

Conflicts: drivers/net/wireless/rt2x00/rt2x00dev.c net/8021q/vlan_dev.c
2026-09-24 18:16:04 +00:00 · 2008-03-18 00:37:55 -07:00 · 2008-03-18 00:37:55 -07:00 · 577f99c1d0
commit 577f99c1d0
parent 26c0f03f6b 2f633928cb
1043 changed files with 21813 additions and 17481 deletions
--- a/include/asm-arm/arch-omap/board-h3.h
+++ b/include/asm-arm/arch-omap/board-h3.h
--- a/include/asm-arm/arch-omap/common.h
+++ b/include/asm-arm/arch-omap/common.h
--- a/include/asm-arm/arch-omap/gpioexpander.h
+++ b/include/asm-arm/arch-omap/gpioexpander.h
--- a/include/asm-arm/arch-pxa/entry-macro.S
+++ b/include/asm-arm/arch-pxa/entry-macro.S
--- a/include/asm-arm/arch-pxa/pxa-regs.h
+++ b/include/asm-arm/arch-pxa/pxa-regs.h
--- a/include/asm-arm/kexec.h
+++ b/include/asm-arm/kexec.h
--- a/include/asm-arm/kprobes.h
+++ b/include/asm-arm/kprobes.h
--- a/include/asm-arm/pgtable-nommu.h
+++ b/include/asm-arm/pgtable-nommu.h
--- a/include/asm-arm/plat-s3c/uncompress.h
+++ b/include/asm-arm/plat-s3c/uncompress.h
--- a/include/asm-arm/proc-fns.h
+++ b/include/asm-arm/proc-fns.h
--- a/include/asm-arm/unaligned.h
+++ b/include/asm-arm/unaligned.h
--- a/include/asm-avr32/pgtable.h
+++ b/include/asm-avr32/pgtable.h
--- a/include/asm-blackfin/gptimers.h
+++ b/include/asm-blackfin/gptimers.h
--- a/include/asm-blackfin/irq.h
+++ b/include/asm-blackfin/irq.h
--- a/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h
--- a/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h
--- a/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h
--- a/include/asm-blackfin/mach-bf548/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf548/bfin_serial_5xx.h
--- a/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h
--- a/include/asm-blackfin/mach-bf561/blackfin.h
+++ b/include/asm-blackfin/mach-bf561/blackfin.h
--- a/include/asm-blackfin/mach-bf561/cdefBF561.h
+++ b/include/asm-blackfin/mach-bf561/cdefBF561.h
--- a/include/asm-blackfin/mmu_context.h
+++ b/include/asm-blackfin/mmu_context.h
--- a/include/asm-blackfin/unistd.h
+++ b/include/asm-blackfin/unistd.h
--- a/include/asm-cris/uaccess.h
+++ b/include/asm-cris/uaccess.h
--- a/include/asm-cris/unistd.h
+++ b/include/asm-cris/unistd.h
--- a/include/asm-h8300/uaccess.h
+++ b/include/asm-h8300/uaccess.h
--- a/include/asm-ia64/Kbuild
+++ b/include/asm-ia64/Kbuild
--- a/include/asm-ia64/hw_irq.h
+++ b/include/asm-ia64/hw_irq.h
--- a/include/asm-ia64/kprobes.h
+++ b/include/asm-ia64/kprobes.h
--- a/include/asm-ia64/ptrace.h
+++ b/include/asm-ia64/ptrace.h
--- a/include/asm-ia64/sal.h
+++ b/include/asm-ia64/sal.h
--- a/include/asm-m68k/unistd.h
+++ b/include/asm-m68k/unistd.h
--- a/include/asm-m68knommu/machdep.h
+++ b/include/asm-m68knommu/machdep.h
--- a/include/asm-m68knommu/unistd.h
+++ b/include/asm-m68knommu/unistd.h
--- a/include/asm-mips/cacheflush.h
+++ b/include/asm-mips/cacheflush.h
--- a/include/asm-mips/highmem.h
+++ b/include/asm-mips/highmem.h
--- a/include/asm-mips/mach-ip27/cpu-feature-overrides.h
+++ b/include/asm-mips/mach-ip27/cpu-feature-overrides.h
--- a/include/asm-mips/mach-jmr3927/ioremap.h
+++ b/include/asm-mips/mach-jmr3927/ioremap.h
--- a/include/asm-mips/mach-lasat/irq.h
+++ b/include/asm-mips/mach-lasat/irq.h
--- a/include/asm-mips/pgtable-32.h
+++ b/include/asm-mips/pgtable-32.h
--- a/include/asm-mips/time.h
+++ b/include/asm-mips/time.h
--- a/include/asm-mn10300/Kbuild
+++ b/include/asm-mn10300/Kbuild
--- a/include/asm-parisc/elf.h
+++ b/include/asm-parisc/elf.h
--- a/include/asm-parisc/fixmap.h
+++ b/include/asm-parisc/fixmap.h
--- a/include/asm-parisc/futex.h
+++ b/include/asm-parisc/futex.h
--- a/include/asm-parisc/pdc.h
+++ b/include/asm-parisc/pdc.h
--- a/include/asm-parisc/pgalloc.h
+++ b/include/asm-parisc/pgalloc.h
--- a/include/asm-parisc/pgtable.h
+++ b/include/asm-parisc/pgtable.h
--- a/include/asm-parisc/unistd.h
+++ b/include/asm-parisc/unistd.h
--- a/include/asm-powerpc/kprobes.h
+++ b/include/asm-powerpc/kprobes.h
--- a/include/asm-powerpc/pgtable-ppc32.h
+++ b/include/asm-powerpc/pgtable-ppc32.h
--- a/include/asm-powerpc/reg.h
+++ b/include/asm-powerpc/reg.h
--- a/include/asm-ppc/pgtable.h
+++ b/include/asm-ppc/pgtable.h
--- a/include/asm-s390/kprobes.h
+++ b/include/asm-s390/kprobes.h
--- a/include/asm-sh/cpu-sh3/cache.h
+++ b/include/asm-sh/cpu-sh3/cache.h
--- a/include/asm-sh/delay.h
+++ b/include/asm-sh/delay.h
--- a/include/asm-sh/entry-macros.S
+++ b/include/asm-sh/entry-macros.S
--- a/include/asm-sparc/system.h
+++ b/include/asm-sparc/system.h
--- a/include/asm-sparc64/kprobes.h
+++ b/include/asm-sparc64/kprobes.h
--- a/include/asm-sparc64/system.h
+++ b/include/asm-sparc64/system.h
--- a/include/asm-x86/Kbuild
+++ b/include/asm-x86/Kbuild
--- a/include/asm-x86/futex.h
+++ b/include/asm-x86/futex.h
--- a/include/asm-x86/kprobes.h
+++ b/include/asm-x86/kprobes.h
--- a/include/asm-x86/lguest.h
+++ b/include/asm-x86/lguest.h
--- a/include/asm-x86/nops.h
+++ b/include/asm-x86/nops.h
--- a/include/asm-x86/page_64.h
+++ b/include/asm-x86/page_64.h
--- a/include/asm-x86/pgtable_32.h
+++ b/include/asm-x86/pgtable_32.h
--- a/include/asm-x86/ptrace-abi.h
+++ b/include/asm-x86/ptrace-abi.h
--- a/include/crypto/internal/skcipher.h
+++ b/include/crypto/internal/skcipher.h
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
--- a/include/linux/cgroup_subsys.h
+++ b/include/linux/cgroup_subsys.h
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
--- a/include/linux/debugfs.h
+++ b/include/linux/debugfs.h
--- a/include/linux/delay.h
+++ b/include/linux/delay.h
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
--- a/include/linux/elfcore-compat.h
+++ b/include/linux/elfcore-compat.h
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
--- a/include/linux/exportfs.h
+++ b/include/linux/exportfs.h
--- a/include/linux/ext4_fs_extents.h
+++ b/include/linux/ext4_fs_extents.h
--- a/include/linux/firmware.h
+++ b/include/linux/firmware.h
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
--- a/include/linux/gpio.h
+++ b/include/linux/gpio.h
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
--- a/include/linux/in.h
+++ b/include/linux/in.h
--- a/include/linux/iommu-helper.h
+++ b/include/linux/iommu-helper.h
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
--- a/include/linux/maple.h
+++ b/include/linux/maple.h
--- a/include/linux/marker.h
+++ b/include/linux/marker.h
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
--- a/include/linux/memstick.h
+++ b/include/linux/memstick.h
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
--- a/include/linux/netfilter/nfnetlink_compat.h
+++ b/include/linux/netfilter/nfnetlink_compat.h
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
--- a/Show more
+++ b/Show more