Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 into sh/hwblk

2026-10-14 05:55:17 +00:00 · 2009-08-04 15:05:39 +09:00 · 2009-08-04 15:05:39 +09:00 · 00111076f7
commit 00111076f7
parent 133b170f08 2e6713c766
353 changed files with 11792 additions and 7950 deletions
--- a/6
+++ b/6
--- a/Documentation/filesystems/sysfs.txt
+++ b/Documentation/filesystems/sysfs.txt
--- a/Documentation/sound/alsa/Procfile.txt
+++ b/Documentation/sound/alsa/Procfile.txt
--- a/Documentation/sysrq.txt
+++ b/Documentation/sysrq.txt
--- a/Documentation/video4linux/CARDLIST.em28xx
+++ b/Documentation/video4linux/CARDLIST.em28xx
--- a/Documentation/video4linux/gspca.txt
+++ b/Documentation/video4linux/gspca.txt
--- a/2769
+++ b/2769
--- a/arch/alpha/include/asm/tlb.h
+++ b/arch/alpha/include/asm/tlb.h
--- a/arch/arm/include/asm/device.h
+++ b/arch/arm/include/asm/device.h
--- a/arch/arm/include/asm/tlb.h
+++ b/arch/arm/include/asm/tlb.h
--- a/arch/arm/plat-omap/debug-leds.c
+++ b/arch/arm/plat-omap/debug-leds.c
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
--- a/arch/avr32/include/asm/pgalloc.h
+++ b/arch/avr32/include/asm/pgalloc.h
--- a/arch/cris/include/asm/pgalloc.h
+++ b/arch/cris/include/asm/pgalloc.h
--- a/arch/frv/include/asm/pgalloc.h
+++ b/arch/frv/include/asm/pgalloc.h
--- a/arch/frv/include/asm/pgtable.h
+++ b/arch/frv/include/asm/pgtable.h
--- a/arch/ia64/include/asm/device.h
+++ b/arch/ia64/include/asm/device.h
--- a/arch/ia64/include/asm/pgalloc.h
+++ b/arch/ia64/include/asm/pgalloc.h
--- a/arch/ia64/include/asm/tlb.h
+++ b/arch/ia64/include/asm/tlb.h
--- a/arch/m32r/include/asm/pgalloc.h
+++ b/arch/m32r/include/asm/pgalloc.h
--- a/arch/m68k/include/asm/motorola_pgalloc.h
+++ b/arch/m68k/include/asm/motorola_pgalloc.h
--- a/arch/m68k/include/asm/sun3_pgalloc.h
+++ b/arch/m68k/include/asm/sun3_pgalloc.h
--- a/arch/microblaze/Makefile
+++ b/arch/microblaze/Makefile
--- a/arch/microblaze/include/asm/device.h
+++ b/arch/microblaze/include/asm/device.h
--- a/arch/microblaze/include/asm/io.h
+++ b/arch/microblaze/include/asm/io.h
--- a/arch/microblaze/include/asm/pgalloc.h
+++ b/arch/microblaze/include/asm/pgalloc.h
--- a/arch/microblaze/include/asm/pgtable.h
+++ b/arch/microblaze/include/asm/pgtable.h
--- a/arch/microblaze/include/asm/prom.h
+++ b/arch/microblaze/include/asm/prom.h
--- a/arch/microblaze/include/asm/tlb.h
+++ b/arch/microblaze/include/asm/tlb.h
--- a/arch/microblaze/include/asm/uaccess.h
+++ b/arch/microblaze/include/asm/uaccess.h
--- a/arch/microblaze/kernel/Makefile
+++ b/arch/microblaze/kernel/Makefile
--- a/arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c
+++ b/arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c
--- a/arch/microblaze/kernel/cpu/cpuinfo-static.c
+++ b/arch/microblaze/kernel/cpu/cpuinfo-static.c
--- a/arch/microblaze/kernel/cpu/cpuinfo.c
+++ b/arch/microblaze/kernel/cpu/cpuinfo.c
--- a/arch/microblaze/kernel/head.S
+++ b/arch/microblaze/kernel/head.S
--- a/arch/microblaze/kernel/hw_exception_handler.S
+++ b/arch/microblaze/kernel/hw_exception_handler.S
--- a/arch/microblaze/kernel/module.c
+++ b/arch/microblaze/kernel/module.c
--- a/arch/microblaze/kernel/setup.c
+++ b/arch/microblaze/kernel/setup.c
--- a/arch/microblaze/kernel/sys_microblaze.c
+++ b/arch/microblaze/kernel/sys_microblaze.c
--- a/arch/microblaze/kernel/syscall_table.S
+++ b/arch/microblaze/kernel/syscall_table.S
--- a/arch/microblaze/mm/fault.c
+++ b/arch/microblaze/mm/fault.c
--- a/arch/mips/include/asm/pgalloc.h
+++ b/arch/mips/include/asm/pgalloc.h
--- a/arch/mn10300/include/asm/pgalloc.h
+++ b/arch/mn10300/include/asm/pgalloc.h
--- a/arch/parisc/include/asm/tlb.h
+++ b/arch/parisc/include/asm/tlb.h
--- a/arch/powerpc/include/asm/device.h
+++ b/arch/powerpc/include/asm/device.h
--- a/arch/powerpc/include/asm/pgalloc-32.h
+++ b/arch/powerpc/include/asm/pgalloc-32.h
--- a/arch/powerpc/include/asm/pgalloc-64.h
+++ b/arch/powerpc/include/asm/pgalloc-64.h
--- a/arch/powerpc/include/asm/pgalloc.h
+++ b/arch/powerpc/include/asm/pgalloc.h
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
--- a/arch/s390/include/asm/tlb.h
+++ b/arch/s390/include/asm/tlb.h
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
--- a/arch/s390/kernel/vdso64/clock_gettime.S
+++ b/arch/s390/kernel/vdso64/clock_gettime.S
--- a/arch/s390/power/swsusp.c
+++ b/arch/s390/power/swsusp.c
--- a/arch/s390/power/swsusp_asm64.S
+++ b/arch/s390/power/swsusp_asm64.S
--- a/arch/sh/include/asm/pgalloc.h
+++ b/arch/sh/include/asm/pgalloc.h
--- a/arch/sh/include/asm/tlb.h
+++ b/arch/sh/include/asm/tlb.h
--- a/arch/sparc/include/asm/device.h
+++ b/arch/sparc/include/asm/device.h
--- a/arch/sparc/include/asm/pgalloc_32.h
+++ b/arch/sparc/include/asm/pgalloc_32.h
--- a/arch/sparc/include/asm/tlb_64.h
+++ b/arch/sparc/include/asm/tlb_64.h
--- a/arch/um/include/asm/pgalloc.h
+++ b/arch/um/include/asm/pgalloc.h
--- a/arch/um/include/asm/tlb.h
+++ b/arch/um/include/asm/tlb.h
--- a/arch/x86/include/asm/device.h
+++ b/arch/x86/include/asm/device.h
--- a/arch/x86/include/asm/pgalloc.h
+++ b/arch/x86/include/asm/pgalloc.h
--- a/arch/x86/include/asm/uaccess.h
+++ b/arch/x86/include/asm/uaccess.h
--- a/arch/x86/include/asm/uaccess_64.h
+++ b/arch/x86/include/asm/uaccess_64.h
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
--- a/arch/x86/kernel/irqinit.c
+++ b/arch/x86/kernel/irqinit.c
--- a/arch/x86/kernel/mfgpt_32.c
+++ b/arch/x86/kernel/mfgpt_32.c
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
--- a/arch/x86/mm/highmem_32.c
+++ b/arch/x86/mm/highmem_32.c
--- a/arch/x86/mm/pgtable.c
+++ b/arch/x86/mm/pgtable.c
--- a/arch/x86/mm/srat_64.c
+++ b/arch/x86/mm/srat_64.c
--- a/arch/xtensa/include/asm/tlb.h
+++ b/arch/xtensa/include/asm/tlb.h
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
--- a/drivers/ata/pata_at91.c
+++ b/drivers/ata/pata_at91.c
--- a/drivers/ata/pata_octeon_cf.c
+++ b/drivers/ata/pata_octeon_cf.c
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
--- a/drivers/base/sys.c
+++ b/drivers/base/sys.c
--- a/drivers/char/n_tty.c
+++ b/drivers/char/n_tty.c
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
--- a/drivers/char/tty_buffer.c
+++ b/drivers/char/tty_buffer.c
--- a/drivers/char/vr41xx_giu.c
+++ b/drivers/char/vr41xx_giu.c
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
--- a/drivers/dma/txx9dmac.c
+++ b/drivers/dma/txx9dmac.c
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
--- a/drivers/edac/x38_edac.c
+++ b/drivers/edac/x38_edac.c
--- a/drivers/gpu/drm/radeon/Makefile
+++ b/drivers/gpu/drm/radeon/Makefile
--- a/Show more
+++ b/Show more