Merge branch 'sh/stable-updates'

Conflicts: arch/sh/mm/cache-sh4.c
2026-09-28 19:20:30 +00:00 · 2009-10-16 15:14:50 +09:00 · 2009-10-16 15:14:50 +09:00 · abeaf33a41
commit abeaf33a41
parent 731ba3301d 52a94909f0
241 changed files with 12176 additions and 1118 deletions
--- a/Documentation/ABI/testing/sysfs-class-uwb_rc-wusbhc
+++ b/Documentation/ABI/testing/sysfs-class-uwb_rc-wusbhc
--- a/Documentation/debugging-via-ohci1394.txt
+++ b/Documentation/debugging-via-ohci1394.txt
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/ext3.txt
+++ b/Documentation/filesystems/ext3.txt
--- a/Documentation/flexible-arrays.txt
+++ b/Documentation/flexible-arrays.txt
--- a/Documentation/sound/alsa/HD-Audio-Models.txt
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
--- a/16
+++ b/16
--- a/48
+++ b/48
--- a/arch/arm/configs/omap3_beagle_defconfig
+++ b/arch/arm/configs/omap3_beagle_defconfig
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
--- a/arch/arm/mach-omap2/board-zoom2.c
+++ b/arch/arm/mach-omap2/board-zoom2.c
--- a/arch/arm/mach-omap2/clock24xx.c
+++ b/arch/arm/mach-omap2/clock24xx.c
--- a/arch/arm/mach-omap2/clockdomain.c
+++ b/arch/arm/mach-omap2/clockdomain.c
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
--- a/arch/arm/plat-omap/mcbsp.c
+++ b/arch/arm/plat-omap/mcbsp.c
--- a/arch/powerpc/include/asm/firmware.h
+++ b/arch/powerpc/include/asm/firmware.h
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
--- a/arch/powerpc/kernel/kgdb.c
+++ b/arch/powerpc/kernel/kgdb.c
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
--- a/arch/powerpc/mm/slb_low.S
+++ b/arch/powerpc/mm/slb_low.S
--- a/arch/powerpc/platforms/cell/axon_msi.c
+++ b/arch/powerpc/platforms/cell/axon_msi.c
--- a/arch/powerpc/platforms/powermac/low_i2c.c
+++ b/arch/powerpc/platforms/powermac/low_i2c.c
--- a/arch/powerpc/platforms/pseries/firmware.c
+++ b/arch/powerpc/platforms/pseries/firmware.c
--- a/arch/s390/hypfs/hypfs_diag.c
+++ b/arch/s390/hypfs/hypfs_diag.c
--- a/arch/s390/kernel/processor.c
+++ b/arch/s390/kernel/processor.c
--- a/arch/sh/boards/mach-landisk/gio.c
+++ b/arch/sh/boards/mach-landisk/gio.c
--- a/arch/sh/mm/cache-sh4.c
+++ b/arch/sh/mm/cache-sh4.c
--- a/arch/sh/mm/cache.c
+++ b/arch/sh/mm/cache.c
--- a/arch/sparc/kernel/ldc.c
+++ b/arch/sparc/kernel/ldc.c
--- a/arch/sparc/kernel/perf_event.c
+++ b/arch/sparc/kernel/perf_event.c
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
--- a/arch/x86/include/asm/paravirt_types.h
+++ b/arch/x86/include/asm/paravirt_types.h
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
--- a/arch/x86/kernel/smp.c
+++ b/arch/x86/kernel/smp.c
--- a/arch/x86/kernel/time.c
+++ b/arch/x86/kernel/time.c
--- a/arch/x86/kernel/trampoline.c
+++ b/arch/x86/kernel/trampoline.c
--- a/arch/x86/kernel/trampoline_64.S
+++ b/arch/x86/kernel/trampoline_64.S
--- a/arch/x86/kernel/vmi_32.c
+++ b/arch/x86/kernel/vmi_32.c
--- a/block/blk-core.c
+++ b/block/blk-core.c
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
--- a/block/blk-tag.c
+++ b/block/blk-tag.c
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
--- a/block/elevator.c
+++ b/block/elevator.c
--- a/block/genhd.c
+++ b/block/genhd.c
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
--- a/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
--- a/drivers/char/genrtc.c
+++ b/drivers/char/genrtc.c
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
--- a/drivers/char/tty_buffer.c
+++ b/drivers/char/tty_buffer.c
--- a/drivers/char/vt_ioctl.c
+++ b/drivers/char/vt_ioctl.c
--- a/drivers/firewire/sbp2.c
+++ b/drivers/firewire/sbp2.c
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
--- a/drivers/hid/hid-twinhan.c
+++ b/drivers/hid/hid-twinhan.c
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
--- a/drivers/mfd/twl4030-core.c
+++ b/drivers/mfd/twl4030-core.c
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
--- a/drivers/net/can/sja1000/sja1000_of_platform.c
+++ b/drivers/net/can/sja1000/sja1000_of_platform.c
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
--- a/drivers/net/fec_mpc52xx.c
+++ b/drivers/net/fec_mpc52xx.c
--- a/drivers/net/fec_mpc52xx_phy.c
+++ b/drivers/net/fec_mpc52xx_phy.c
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
--- a/drivers/net/fs_enet/mii-bitbang.c
+++ b/drivers/net/fs_enet/mii-bitbang.c
--- a/drivers/net/fs_enet/mii-fec.c
+++ b/drivers/net/fs_enet/mii-fec.c
--- a/drivers/net/fsl_pq_mdio.c
+++ b/drivers/net/fsl_pq_mdio.c
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
--- a/drivers/net/ibm_newemac/emac.h
+++ b/drivers/net/ibm_newemac/emac.h
--- a/drivers/net/irda/sa1100_ir.c
+++ b/drivers/net/irda/sa1100_ir.c
--- a/drivers/net/ixp2000/enp2611.c
+++ b/drivers/net/ixp2000/enp2611.c
--- a/drivers/net/ixp2000/ixpdev.c
+++ b/drivers/net/ixp2000/ixpdev.c
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
--- a/drivers/net/phy/mdio-gpio.c
+++ b/drivers/net/phy/mdio-gpio.c
--- a/drivers/net/qlge/qlge.h
+++ b/drivers/net/qlge/qlge.h
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
--- a/drivers/net/qlge/qlge_mpi.c
+++ b/drivers/net/qlge/qlge_mpi.c
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
--- a/drivers/net/stmmac/Kconfig
+++ b/drivers/net/stmmac/Kconfig
--- a/drivers/net/stmmac/Makefile
+++ b/drivers/net/stmmac/Makefile
--- a/drivers/net/stmmac/common.h
+++ b/drivers/net/stmmac/common.h
--- a/drivers/net/stmmac/descs.h
+++ b/drivers/net/stmmac/descs.h
--- a/drivers/net/stmmac/gmac.c
+++ b/drivers/net/stmmac/gmac.c
--- a/Show more
+++ b/Show more