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

2026-11-13 07:31:07 +00:00 · 2011-08-09 16:01:09 -05:00 · 2011-08-09 16:01:09 -05:00 · c66eadc0b1
commit c66eadc0b1
parent c25bdbe288 322a8b0340
521 changed files with 11737 additions and 5757 deletions
--- a/Documentation/ABI/testing/sysfs-platform-ideapad-laptop
+++ b/Documentation/ABI/testing/sysfs-platform-ideapad-laptop
--- a/Documentation/CodingStyle
+++ b/Documentation/CodingStyle
--- a/Documentation/acpi/apei/einj.txt
+++ b/Documentation/acpi/apei/einj.txt
--- a/Documentation/device-mapper/dm-crypt.txt
+++ b/Documentation/device-mapper/dm-crypt.txt
--- a/Documentation/device-mapper/dm-flakey.txt
+++ b/Documentation/device-mapper/dm-flakey.txt
--- a/Documentation/device-mapper/dm-raid.txt
+++ b/Documentation/device-mapper/dm-raid.txt
--- a/Documentation/devicetree/bindings/gpio/gpio_keys.txt
+++ b/Documentation/devicetree/bindings/gpio/gpio_keys.txt
--- a/Documentation/devicetree/bindings/input/fsl-mma8450.txt
+++ b/Documentation/devicetree/bindings/input/fsl-mma8450.txt
--- a/Documentation/fault-injection/fault-injection.txt
+++ b/Documentation/fault-injection/fault-injection.txt
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/frv/booting.txt
+++ b/Documentation/frv/booting.txt
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/m68k/kernel-options.txt
+++ b/Documentation/m68k/kernel-options.txt
--- a/Documentation/networking/bonding.txt
+++ b/Documentation/networking/bonding.txt
--- a/Documentation/power/runtime_pm.txt
+++ b/Documentation/power/runtime_pm.txt
--- a/18
+++ b/18
--- a/4
+++ b/4
--- a/arch/Kconfig
+++ b/arch/Kconfig
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
--- a/arch/arm/kernel/armksyms.c
+++ b/arch/arm/kernel/armksyms.c
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
--- a/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
--- a/arch/arm/lib/sha1.S
+++ b/arch/arm/lib/sha1.S
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
--- a/arch/cris/arch-v10/drivers/sync_serial.c
+++ b/arch/cris/arch-v10/drivers/sync_serial.c
--- a/arch/cris/arch-v10/kernel/irq.c
+++ b/arch/cris/arch-v10/kernel/irq.c
--- a/arch/cris/include/asm/thread_info.h
+++ b/arch/cris/include/asm/thread_info.h
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
--- a/arch/ia64/kernel/efi.c
+++ b/arch/ia64/kernel/efi.c
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
--- a/arch/parisc/include/asm/atomic.h
+++ b/arch/parisc/include/asm/atomic.h
--- a/arch/parisc/include/asm/futex.h
+++ b/arch/parisc/include/asm/futex.h
--- a/arch/parisc/include/asm/unistd.h
+++ b/arch/parisc/include/asm/unistd.h
--- a/arch/parisc/kernel/syscall_table.S
+++ b/arch/parisc/kernel/syscall_table.S
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
--- a/arch/s390/include/asm/ipl.h
+++ b/arch/s390/include/asm/ipl.h
--- a/arch/s390/include/asm/lowcore.h
+++ b/arch/s390/include/asm/lowcore.h
--- a/arch/s390/include/asm/processor.h
+++ b/arch/s390/include/asm/processor.h
--- a/arch/s390/include/asm/system.h
+++ b/arch/s390/include/asm/system.h
--- a/arch/s390/kernel/asm-offsets.c
+++ b/arch/s390/kernel/asm-offsets.c
--- a/arch/s390/kernel/base.S
+++ b/arch/s390/kernel/base.S
--- a/arch/s390/kernel/compat_signal.c
+++ b/arch/s390/kernel/compat_signal.c
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
--- a/arch/s390/kernel/reipl64.S
+++ b/arch/s390/kernel/reipl64.S
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
--- a/arch/s390/kernel/signal.c
+++ b/arch/s390/kernel/signal.c
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
--- a/arch/s390/mm/maccess.c
+++ b/arch/s390/mm/maccess.c
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
--- a/arch/sh/kernel/idle.c
+++ b/arch/sh/kernel/idle.c
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
--- a/arch/sparc/include/asm/Kbuild
+++ b/arch/sparc/include/asm/Kbuild
--- a/arch/sparc/include/asm/bitops_64.h
+++ b/arch/sparc/include/asm/bitops_64.h
--- a/arch/sparc/include/asm/div64.h
+++ b/arch/sparc/include/asm/div64.h
--- a/arch/sparc/include/asm/elf_64.h
+++ b/arch/sparc/include/asm/elf_64.h
--- a/arch/sparc/include/asm/hypervisor.h
+++ b/arch/sparc/include/asm/hypervisor.h
--- a/arch/sparc/include/asm/irq_regs.h
+++ b/arch/sparc/include/asm/irq_regs.h
--- a/arch/sparc/include/asm/local.h
+++ b/arch/sparc/include/asm/local.h
--- a/arch/sparc/include/asm/local64.h
+++ b/arch/sparc/include/asm/local64.h
--- a/arch/sparc/include/asm/tsb.h
+++ b/arch/sparc/include/asm/tsb.h
--- a/arch/sparc/kernel/cpu.c
+++ b/arch/sparc/kernel/cpu.c
--- a/arch/sparc/kernel/ds.c
+++ b/arch/sparc/kernel/ds.c
--- a/arch/sparc/kernel/entry.h
+++ b/arch/sparc/kernel/entry.h
--- a/arch/sparc/kernel/head_64.S
+++ b/arch/sparc/kernel/head_64.S
--- a/arch/sparc/kernel/hvapi.c
+++ b/arch/sparc/kernel/hvapi.c
--- a/arch/sparc/kernel/hvcalls.S
+++ b/arch/sparc/kernel/hvcalls.S
--- a/arch/sparc/kernel/kernel.h
+++ b/arch/sparc/kernel/kernel.h
--- a/arch/sparc/kernel/ktlb.S
+++ b/arch/sparc/kernel/ktlb.S
--- a/arch/sparc/kernel/mdesc.c
+++ b/arch/sparc/kernel/mdesc.c
--- a/arch/sparc/kernel/setup_64.c
+++ b/arch/sparc/kernel/setup_64.c
--- a/arch/sparc/kernel/sparc_ksyms_64.c
+++ b/arch/sparc/kernel/sparc_ksyms_64.c
--- a/arch/sparc/kernel/sstate.c
+++ b/arch/sparc/kernel/sstate.c
--- a/arch/sparc/kernel/unaligned_64.c
+++ b/arch/sparc/kernel/unaligned_64.c
--- a/arch/sparc/kernel/vmlinux.lds.S
+++ b/arch/sparc/kernel/vmlinux.lds.S
--- a/arch/sparc/lib/Makefile
+++ b/arch/sparc/lib/Makefile
--- a/arch/sparc/lib/NG2page.S
+++ b/arch/sparc/lib/NG2page.S
--- a/arch/sparc/lib/NGpage.S
+++ b/arch/sparc/lib/NGpage.S
--- a/arch/sparc/lib/atomic32.c
+++ b/arch/sparc/lib/atomic32.c
--- a/arch/sparc/lib/ffs.S
+++ b/arch/sparc/lib/ffs.S
--- a/arch/sparc/lib/hweight.S
+++ b/arch/sparc/lib/hweight.S
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
--- a/arch/tile/include/asm/Kbuild
+++ b/arch/tile/include/asm/Kbuild
--- a/arch/tile/include/asm/bug.h
+++ b/arch/tile/include/asm/bug.h
--- a/arch/tile/include/asm/bugs.h
+++ b/arch/tile/include/asm/bugs.h
--- a/arch/tile/include/asm/cputime.h
+++ b/arch/tile/include/asm/cputime.h
--- a/arch/tile/include/asm/device.h
+++ b/arch/tile/include/asm/device.h
--- a/arch/tile/include/asm/div64.h
+++ b/arch/tile/include/asm/div64.h
--- a/arch/tile/include/asm/emergency-restart.h
+++ b/arch/tile/include/asm/emergency-restart.h
--- a/arch/tile/include/asm/errno.h
+++ b/arch/tile/include/asm/errno.h
--- a/arch/tile/include/asm/fb.h
+++ b/arch/tile/include/asm/fb.h
--- a/arch/tile/include/asm/fcntl.h
+++ b/arch/tile/include/asm/fcntl.h
--- a/arch/tile/include/asm/fixmap.h
+++ b/arch/tile/include/asm/fixmap.h
--- a/Show more
+++ b/Show more