Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts: fs/cifs/dir.c
2026-09-26 18:16:26 +00:00 · 2011-01-09 23:18:16 +00:00 · 2011-01-09 23:18:16 +00:00 · acc6f11272
commit acc6f11272
parent 7e12eddb73 0c21e3aaf6
4043 changed files with 354581 additions and 219474 deletions
--- a/.mailmap
+++ b/.mailmap
--- a/2
+++ b/2
--- a/Documentation/ABI/testing/sysfs-class-net-batman-adv
+++ b/Documentation/ABI/testing/sysfs-class-net-batman-adv
--- a/Documentation/ABI/testing/sysfs-class-net-mesh
+++ b/Documentation/ABI/testing/sysfs-class-net-mesh
--- a/Documentation/ABI/testing/sysfs-tty
+++ b/Documentation/ABI/testing/sysfs-tty
--- a/Documentation/DocBook/80211.tmpl
+++ b/Documentation/DocBook/80211.tmpl
--- a/Documentation/DocBook/device-drivers.tmpl
+++ b/Documentation/DocBook/device-drivers.tmpl
--- a/Documentation/DocBook/v4l/func-ioctl.xml
+++ b/Documentation/DocBook/v4l/func-ioctl.xml
--- a/Documentation/DocBook/v4l/pixfmt.xml
+++ b/Documentation/DocBook/v4l/pixfmt.xml
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
--- a/Documentation/RCU/trace.txt
+++ b/Documentation/RCU/trace.txt
--- a/Documentation/arm/00-INDEX
+++ b/Documentation/arm/00-INDEX
--- a/Documentation/arm/OMAP/omap_pm
+++ b/Documentation/arm/OMAP/omap_pm
--- a/Documentation/arm/swp_emulation
+++ b/Documentation/arm/swp_emulation
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
--- a/Documentation/dvb/lmedm04.txt
+++ b/Documentation/dvb/lmedm04.txt
--- a/drivers/staging/udlfb/udlfb.txt
+++ b/drivers/staging/udlfb/udlfb.txt
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
--- a/Documentation/filesystems/dentry-locking.txt
+++ b/Documentation/filesystems/dentry-locking.txt
--- a/Documentation/filesystems/path-lookup.txt
+++ b/Documentation/filesystems/path-lookup.txt
--- a/Documentation/filesystems/porting
+++ b/Documentation/filesystems/porting
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
--- a/Documentation/input/cma3000_d0x.txt
+++ b/Documentation/input/cma3000_d0x.txt
--- a/Documentation/input/multi-touch-protocol.txt
+++ b/Documentation/input/multi-touch-protocol.txt
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
--- a/Documentation/kernel-docs.txt
+++ b/Documentation/kernel-docs.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/networking/LICENSE.qlcnic
+++ b/Documentation/networking/LICENSE.qlcnic
--- a/Documentation/networking/batman-adv.txt
+++ b/Documentation/networking/batman-adv.txt
--- a/Documentation/networking/dccp.txt
+++ b/Documentation/networking/dccp.txt
--- a/Documentation/networking/e100.txt
+++ b/Documentation/networking/e100.txt
--- a/Documentation/networking/e1000.txt
+++ b/Documentation/networking/e1000.txt
--- a/Documentation/networking/e1000e.txt
+++ b/Documentation/networking/e1000e.txt
--- a/Documentation/networking/igb.txt
+++ b/Documentation/networking/igb.txt
--- a/Documentation/networking/igbvf.txt
+++ b/Documentation/networking/igbvf.txt
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
--- a/Documentation/networking/ixgb.txt
+++ b/Documentation/networking/ixgb.txt
--- a/Documentation/networking/ixgbe.txt
+++ b/Documentation/networking/ixgbe.txt
--- a/Documentation/networking/ixgbevf.txt
+++ b/Documentation/networking/ixgbevf.txt
--- a/Documentation/networking/stmmac.txt
+++ b/Documentation/networking/stmmac.txt
--- a/Documentation/scsi/ChangeLog.megaraid_sas
+++ b/Documentation/scsi/ChangeLog.megaraid_sas
--- a/Documentation/serial/00-INDEX
+++ b/Documentation/serial/00-INDEX
--- a/Documentation/serial/serial-rs485.txt
+++ b/Documentation/serial/serial-rs485.txt
--- a/Documentation/spi/pxa2xx
+++ b/Documentation/spi/pxa2xx
--- a/Documentation/trace/events-power.txt
+++ b/Documentation/trace/events-power.txt
--- a/Documentation/usb/power-management.txt
+++ b/Documentation/usb/power-management.txt
--- a/Documentation/video4linux/CARDLIST.em28xx
+++ b/Documentation/video4linux/CARDLIST.em28xx
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
--- a/Documentation/video4linux/Makefile
+++ b/Documentation/video4linux/Makefile
--- a/Documentation/video4linux/README.cpia
+++ b/Documentation/video4linux/README.cpia
--- a/Documentation/video4linux/Zoran
+++ b/Documentation/video4linux/Zoran
--- a/Documentation/video4linux/bttv/Cards
+++ b/Documentation/video4linux/bttv/Cards
--- a/Documentation/video4linux/gspca.txt
+++ b/Documentation/video4linux/gspca.txt
--- a/Documentation/video4linux/meye.txt
+++ b/Documentation/video4linux/meye.txt
--- a/Documentation/video4linux/v4lgrab.c
+++ b/Documentation/video4linux/v4lgrab.c
--- a/Documentation/video4linux/videobuf
+++ b/Documentation/video4linux/videobuf
--- a/Documentation/x86/boot.txt
+++ b/Documentation/x86/boot.txt
--- a/84
+++ b/84
--- a/arch/Kconfig
+++ b/arch/Kconfig
--- a/arch/alpha/include/asm/ioctls.h
+++ b/arch/alpha/include/asm/ioctls.h
--- a/arch/alpha/include/asm/perf_event.h
+++ b/arch/alpha/include/asm/perf_event.h
--- a/arch/alpha/kernel/irq_alpha.c
+++ b/arch/alpha/kernel/irq_alpha.c
--- a/arch/alpha/kernel/perf_event.c
+++ b/arch/alpha/kernel/perf_event.c
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
--- a/arch/arm/boot/compressed/head-shmobile.S
+++ b/arch/arm/boot/compressed/head-shmobile.S
--- a/arch/arm/common/Kconfig
+++ b/arch/arm/common/Kconfig
--- a/arch/arm/common/Makefile
+++ b/arch/arm/common/Makefile
--- a/arch/arm/common/dmabounce.c
+++ b/arch/arm/common/dmabounce.c
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
--- a/arch/arm/plat-versatile/timer-sp.c
+++ b/arch/arm/plat-versatile/timer-sp.c
--- a/arch/arm/configs/ag5evm_defconfig
+++ b/arch/arm/configs/ag5evm_defconfig
--- a/arch/arm/configs/ams_delta_defconfig
+++ b/arch/arm/configs/ams_delta_defconfig
--- a/arch/arm/configs/htcherald_defconfig
+++ b/arch/arm/configs/htcherald_defconfig
--- a/arch/arm/configs/mackerel_defconfig
+++ b/arch/arm/configs/mackerel_defconfig
--- a/arch/arm/configs/mx3_defconfig
+++ b/arch/arm/configs/mx3_defconfig
--- a/arch/arm/configs/n770_defconfig
+++ b/arch/arm/configs/n770_defconfig
--- a/arch/arm/configs/omap1_defconfig
+++ b/arch/arm/configs/omap1_defconfig
--- a/arch/arm/configs/omap_generic_1510_defconfig
+++ b/arch/arm/configs/omap_generic_1510_defconfig
--- a/arch/arm/configs/omap_generic_1610_defconfig
+++ b/arch/arm/configs/omap_generic_1610_defconfig
--- a/arch/arm/configs/omap_generic_1710_defconfig
+++ b/arch/arm/configs/omap_generic_1710_defconfig
--- a/arch/arm/configs/omap_h2_1610_defconfig
+++ b/arch/arm/configs/omap_h2_1610_defconfig
--- a/arch/arm/configs/omap_innovator_1510_defconfig
+++ b/arch/arm/configs/omap_innovator_1510_defconfig
--- a/arch/arm/configs/omap_innovator_1610_defconfig
+++ b/arch/arm/configs/omap_innovator_1610_defconfig
--- a/arch/arm/configs/omap_osk_5912_defconfig
+++ b/arch/arm/configs/omap_osk_5912_defconfig
--- a/arch/arm/configs/omap_perseus2_730_defconfig
+++ b/arch/arm/configs/omap_perseus2_730_defconfig
--- a/arch/arm/configs/palmte_defconfig
+++ b/arch/arm/configs/palmte_defconfig
--- a/arch/arm/configs/palmtt_defconfig
+++ b/arch/arm/configs/palmtt_defconfig
--- a/arch/arm/configs/palmz71_defconfig
+++ b/arch/arm/configs/palmz71_defconfig
--- a/arch/arm/configs/sx1_defconfig
+++ b/arch/arm/configs/sx1_defconfig
--- a/arch/arm/include/asm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
--- a/arch/arm/include/asm/cache.h
+++ b/arch/arm/include/asm/cache.h
--- a/arch/arm/include/asm/clkdev.h
+++ b/arch/arm/include/asm/clkdev.h
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
--- a/arch/arm/include/asm/domain.h
+++ b/arch/arm/include/asm/domain.h
--- a/arch/arm/include/asm/elf.h
+++ b/arch/arm/include/asm/elf.h
--- a/Show more
+++ b/Show more