Merge branch 'linus' into tracing/urgent

2026-09-24 18:16:04 +00:00 · 2008-07-24 08:09:26 +02:00 · 2008-07-24 08:09:26 +02:00 · 28afe961a1
commit 28afe961a1
parent 1e01cb0c6f 338b9bb3ad
3143 changed files with 248407 additions and 143739 deletions
--- a/3
+++ b/3
--- a/Documentation/ABI/testing/sysfs-dev
+++ b/Documentation/ABI/testing/sysfs-dev
--- a/Documentation/DMA-attributes.txt
+++ b/Documentation/DMA-attributes.txt
--- a/Documentation/DocBook/gadget.tmpl
+++ b/Documentation/DocBook/gadget.tmpl
--- a/Documentation/DocBook/uio-howto.tmpl
+++ b/Documentation/DocBook/uio-howto.tmpl
--- a/Documentation/HOWTO
+++ b/Documentation/HOWTO
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/bfs.txt
+++ b/Documentation/filesystems/bfs.txt
--- a/Documentation/filesystems/configfs/configfs.txt
+++ b/Documentation/filesystems/configfs/configfs.txt
--- a/Documentation/filesystems/configfs/configfs_example.c
+++ b/Documentation/filesystems/configfs/configfs_example.c
--- a/Documentation/filesystems/nfs-rdma.txt
+++ b/Documentation/filesystems/nfs-rdma.txt
--- a/Documentation/filesystems/sysfs.txt
+++ b/Documentation/filesystems/sysfs.txt
--- a/Documentation/ia64/paravirt_ops.txt
+++ b/Documentation/ia64/paravirt_ops.txt
--- a/Documentation/input/gameport-programming.txt
+++ b/Documentation/input/gameport-programming.txt
--- a/Documentation/input/input.txt
+++ b/Documentation/input/input.txt
--- a/Documentation/input/joystick-api.txt
+++ b/Documentation/input/joystick-api.txt
--- a/Documentation/input/joystick-parport.txt
+++ b/Documentation/input/joystick-parport.txt
--- a/Documentation/input/joystick.txt
+++ b/Documentation/input/joystick.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/md.txt
+++ b/Documentation/md.txt
--- a/Documentation/networking/bonding.txt
+++ b/Documentation/networking/bonding.txt
--- a/Documentation/networking/dm9000.txt
+++ b/Documentation/networking/dm9000.txt
--- a/Documentation/networking/e1000.txt
+++ b/Documentation/networking/e1000.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/mac80211_hwsim/README
+++ b/Documentation/networking/mac80211_hwsim/README
--- a/Documentation/networking/mac80211_hwsim/hostapd.conf
+++ b/Documentation/networking/mac80211_hwsim/hostapd.conf
--- a/Documentation/networking/mac80211_hwsim/wpa_supplicant.conf
+++ b/Documentation/networking/mac80211_hwsim/wpa_supplicant.conf
--- a/Documentation/networking/multiqueue.txt
+++ b/Documentation/networking/multiqueue.txt
--- a/Documentation/networking/s2io.txt
+++ b/Documentation/networking/s2io.txt
--- a/Documentation/networking/udplite.txt
+++ b/Documentation/networking/udplite.txt
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
--- a/Documentation/powerpc/dts-bindings/fsl/cpm_qe/gpio.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/cpm_qe/gpio.txt
--- a/Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/usb.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/usb.txt
--- a/Documentation/powerpc/dts-bindings/fsl/mcu-mpc8349emitx.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/mcu-mpc8349emitx.txt
--- a/Documentation/powerpc/dts-bindings/fsl/pmc.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/pmc.txt
--- a/Documentation/powerpc/dts-bindings/fsl/tsec.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/tsec.txt
--- a/Documentation/powerpc/dts-bindings/fsl/upm-nand.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/upm-nand.txt
--- a/Documentation/powerpc/dts-bindings/gpio/led.txt
+++ b/Documentation/powerpc/dts-bindings/gpio/led.txt
--- a/Documentation/rfkill.txt
+++ b/Documentation/rfkill.txt
--- a/Documentation/serial/driver
+++ b/Documentation/serial/driver
--- a/Documentation/sound/alsa/DocBook/alsa-driver-api.tmpl
+++ b/Documentation/sound/alsa/DocBook/alsa-driver-api.tmpl
--- a/Documentation/specialix.txt
+++ b/Documentation/specialix.txt
--- a/Documentation/sysfs-rules.txt
+++ b/Documentation/sysfs-rules.txt
--- a/Documentation/telephony/ixj.txt
+++ b/Documentation/telephony/ixj.txt
--- a/Documentation/usb/gadget_serial.txt
+++ b/Documentation/usb/gadget_serial.txt
--- a/Documentation/usb/persist.txt
+++ b/Documentation/usb/persist.txt
--- a/Documentation/usb/uhci.txt
+++ b/Documentation/usb/uhci.txt
--- a/Documentation/video4linux/CARDLIST.cx23885
+++ b/Documentation/video4linux/CARDLIST.cx23885
--- a/Documentation/video4linux/CARDLIST.em28xx
+++ b/Documentation/video4linux/CARDLIST.em28xx
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
--- a/Documentation/video4linux/cx18.txt
+++ b/Documentation/video4linux/cx18.txt
--- a/Documentation/video4linux/gspca.txt
+++ b/Documentation/video4linux/gspca.txt
--- a/Documentation/video4linux/w9968cf.txt
+++ b/Documentation/video4linux/w9968cf.txt
--- a/65
+++ b/65
--- a/3
+++ b/3
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/common/dmabounce.c
+++ b/arch/arm/common/dmabounce.c
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
--- a/arch/arm/configs/ezx_defconfig
+++ b/arch/arm/configs/ezx_defconfig
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
--- a/arch/arm/kernel/kgdb.c
+++ b/arch/arm/kernel/kgdb.c
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
--- a/arch/arm/mach-integrator/impd1.c
+++ b/arch/arm/mach-integrator/impd1.c
--- a/arch/arm/mach-integrator/lm.c
+++ b/arch/arm/mach-integrator/lm.c
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
--- a/arch/arm/mach-pxa/clock.c
+++ b/arch/arm/mach-pxa/clock.c
--- a/arch/arm/mach-pxa/clock.h
+++ b/arch/arm/mach-pxa/clock.h
--- a/arch/arm/mach-pxa/cm-x270-pci.c
+++ b/arch/arm/mach-pxa/cm-x270-pci.c
--- a/arch/arm/mach-pxa/cm-x270-pci.h
+++ b/arch/arm/mach-pxa/cm-x270-pci.h
--- a/arch/arm/mach-pxa/cm-x270.c
+++ b/arch/arm/mach-pxa/cm-x270.c
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
--- a/arch/arm/mach-pxa/devices.c
+++ b/arch/arm/mach-pxa/devices.c
--- a/arch/arm/mach-pxa/devices.h
+++ b/arch/arm/mach-pxa/devices.h
--- a/arch/arm/mach-pxa/e400_lcd.c
+++ b/arch/arm/mach-pxa/e400_lcd.c
--- a/arch/arm/mach-pxa/e740_lcd.c
+++ b/arch/arm/mach-pxa/e740_lcd.c
--- a/arch/arm/mach-pxa/e750_lcd.c
+++ b/arch/arm/mach-pxa/e750_lcd.c
--- a/arch/arm/mach-pxa/e800_lcd.c
+++ b/arch/arm/mach-pxa/e800_lcd.c
--- a/arch/arm/mach-pxa/em-x270.c
+++ b/arch/arm/mach-pxa/em-x270.c
--- a/arch/arm/mach-pxa/eseries.c
+++ b/arch/arm/mach-pxa/eseries.c
--- a/arch/arm/mach-pxa/eseries_udc.c
+++ b/arch/arm/mach-pxa/eseries_udc.c
--- a/arch/arm/mach-pxa/ezx.c
+++ b/arch/arm/mach-pxa/ezx.c
--- a/arch/arm/mach-pxa/littleton.c
+++ b/arch/arm/mach-pxa/littleton.c
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
--- a/arch/arm/mach-pxa/mfp-pxa2xx.c
+++ b/arch/arm/mach-pxa/mfp-pxa2xx.c
--- a/arch/arm/mach-pxa/palmtx.c
+++ b/arch/arm/mach-pxa/palmtx.c
--- a/arch/arm/mach-pxa/pcm027.c
+++ b/arch/arm/mach-pxa/pcm027.c
--- a/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/arch/arm/mach-pxa/pcm990-baseboard.c
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
--- a/arch/arm/mach-pxa/pxa300.c
+++ b/arch/arm/mach-pxa/pxa300.c
--- a/arch/arm/mach-pxa/pxa320.c
+++ b/arch/arm/mach-pxa/pxa320.c
--- a/Show more
+++ b/Show more