Merge branch 'devicetree/next' into spi/next

2026-10-14 05:55:17 +00:00 · 2011-01-14 12:09:49 -07:00 · 2011-01-14 12:09:49 -07:00 · 42a9fa9957
commit 42a9fa9957
parent 5f35765d83 c289ef4143
3081 changed files with 198413 additions and 97920 deletions
--- a/4
+++ b/4
--- a/Documentation/ABI/stable/thermal-notification
+++ b/Documentation/ABI/stable/thermal-notification
--- a/Documentation/ABI/testing/sysfs-class-led
+++ b/Documentation/ABI/testing/sysfs-class-led
--- a/Documentation/ABI/testing/sysfs-platform-ideapad-laptop
+++ b/Documentation/ABI/testing/sysfs-platform-ideapad-laptop
--- a/Documentation/DocBook/mtdnand.tmpl
+++ b/Documentation/DocBook/mtdnand.tmpl
--- a/Documentation/IPMI.txt
+++ b/Documentation/IPMI.txt
--- a/Documentation/acpi/apei/output_format.txt
+++ b/Documentation/acpi/apei/output_format.txt
--- a/Documentation/cgroups/blkio-controller.txt
+++ b/Documentation/cgroups/blkio-controller.txt
--- a/Documentation/cgroups/cgroup_event_listener.c
+++ b/Documentation/cgroups/cgroup_event_listener.c
--- a/Documentation/cgroups/cgroups.txt
+++ b/Documentation/cgroups/cgroups.txt
--- a/Documentation/cgroups/memcg_test.txt
+++ b/Documentation/cgroups/memcg_test.txt
--- a/Documentation/cgroups/memory.txt
+++ b/Documentation/cgroups/memory.txt
--- a/Documentation/device-mapper/dm-crypt.txt
+++ b/Documentation/device-mapper/dm-crypt.txt
--- a/Documentation/device-mapper/dm-raid.txt
+++ b/Documentation/device-mapper/dm-raid.txt
--- a/Documentation/email-clients.txt
+++ b/Documentation/email-clients.txt
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/ntfs.txt
+++ b/Documentation/filesystems/ntfs.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/hwmon/adm9240
+++ b/Documentation/hwmon/adm9240
--- a/Documentation/hwmon/ads7828
+++ b/Documentation/hwmon/ads7828
--- a/Documentation/hwmon/dme1737
+++ b/Documentation/hwmon/dme1737
--- a/Documentation/hwmon/w83627hf
+++ b/Documentation/hwmon/w83627hf
--- a/Documentation/hwmon/w83793
+++ b/Documentation/hwmon/w83793
--- a/Documentation/i2c/muxes/gpio-i2cmux
+++ b/Documentation/i2c/muxes/gpio-i2cmux
--- a/Documentation/input/ff.txt
+++ b/Documentation/input/ff.txt
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
--- a/Documentation/iostats.txt
+++ b/Documentation/iostats.txt
--- a/Documentation/kdump/kdump.txt
+++ b/Documentation/kdump/kdump.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/ko_KR/HOWTO
+++ b/Documentation/ko_KR/HOWTO
--- a/Documentation/kprobes.txt
+++ b/Documentation/kprobes.txt
--- a/Documentation/kvm/api.txt
+++ b/Documentation/kvm/api.txt
--- a/Documentation/kvm/cpuid.txt
+++ b/Documentation/kvm/cpuid.txt
--- a/Documentation/kvm/msr.txt
+++ b/Documentation/kvm/msr.txt
--- a/Documentation/lguest/lguest.txt
+++ b/Documentation/lguest/lguest.txt
--- a/Documentation/magic-number.txt
+++ b/Documentation/magic-number.txt
--- a/Documentation/networking/bridge.txt
+++ b/Documentation/networking/bridge.txt
--- a/Documentation/networking/caif/spi_porting.txt
+++ b/Documentation/networking/caif/spi_porting.txt
--- a/Documentation/networking/dccp.txt
+++ b/Documentation/networking/dccp.txt
--- a/Documentation/networking/generic_netlink.txt
+++ b/Documentation/networking/generic_netlink.txt
--- a/Documentation/nfc/nfc-pn544.txt
+++ b/Documentation/nfc/nfc-pn544.txt
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
--- a/Documentation/powerpc/dts-bindings/4xx/cpm.txt
+++ b/Documentation/powerpc/dts-bindings/4xx/cpm.txt
--- a/Documentation/pps/pps.txt
+++ b/Documentation/pps/pps.txt
--- a/Documentation/scheduler/00-INDEX
+++ b/Documentation/scheduler/00-INDEX
--- a/Documentation/scsi/ChangeLog.lpfc
+++ b/Documentation/scsi/ChangeLog.lpfc
--- a/Documentation/serial/tty.txt
+++ b/Documentation/serial/tty.txt
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
--- a/Documentation/sound/alsa/HD-Audio-Models.txt
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
--- a/Documentation/sysctl/00-INDEX
+++ b/Documentation/sysctl/00-INDEX
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
--- a/Documentation/thermal/sysfs-api.txt
+++ b/Documentation/thermal/sysfs-api.txt
--- a/Documentation/timers/timer_stats.txt
+++ b/Documentation/timers/timer_stats.txt
--- a/Documentation/trace/events.txt
+++ b/Documentation/trace/events.txt
--- a/Documentation/vm/transhuge.txt
+++ b/Documentation/vm/transhuge.txt
--- a/Documentation/w1/slaves/00-INDEX
+++ b/Documentation/w1/slaves/00-INDEX
--- a/Documentation/w1/slaves/w1_ds2423
+++ b/Documentation/w1/slaves/w1_ds2423
--- a/Documentation/x86/boot.txt
+++ b/Documentation/x86/boot.txt
--- a/Documentation/xz.txt
+++ b/Documentation/xz.txt
--- a/Documentation/zh_CN/HOWTO
+++ b/Documentation/zh_CN/HOWTO
--- a/Documentation/zh_CN/SubmittingDrivers
+++ b/Documentation/zh_CN/SubmittingDrivers
--- a/182
+++ b/182
--- a/arch/alpha/include/asm/mman.h
+++ b/arch/alpha/include/asm/mman.h
--- a/arch/alpha/kernel/time.c
+++ b/arch/alpha/kernel/time.c
--- a/arch/arm/common/it8152.c
+++ b/arch/arm/common/it8152.c
--- a/arch/arm/common/vic.c
+++ b/arch/arm/common/vic.c
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
--- a/arch/arm/kernel/module.c
+++ b/arch/arm/kernel/module.c
--- a/arch/arm/mach-at91/board-ecbat91.c
+++ b/arch/arm/mach-at91/board-ecbat91.c
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
--- a/arch/arm/mach-bcmring/csp/chipc/chipcHw.c
+++ b/arch/arm/mach-bcmring/csp/chipc/chipcHw.c
--- a/arch/arm/mach-bcmring/csp/dmac/dmacHw.c
+++ b/arch/arm/mach-bcmring/csp/dmac/dmacHw.c
--- a/arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c
+++ b/arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c
--- a/arch/arm/mach-bcmring/csp/tmr/tmrHw.c
+++ b/arch/arm/mach-bcmring/csp/tmr/tmrHw.c
--- a/arch/arm/mach-bcmring/dma.c
+++ b/arch/arm/mach-bcmring/dma.c
--- a/arch/arm/mach-bcmring/include/csp/dmacHw.h
+++ b/arch/arm/mach-bcmring/include/csp/dmacHw.h
--- a/arch/arm/mach-bcmring/include/csp/tmrHw.h
+++ b/arch/arm/mach-bcmring/include/csp/tmrHw.h
--- a/arch/arm/mach-bcmring/include/mach/csp/dmacHw_priv.h
+++ b/arch/arm/mach-bcmring/include/mach/csp/dmacHw_priv.h
--- a/arch/arm/mach-bcmring/include/mach/csp/dmacHw_reg.h
+++ b/arch/arm/mach-bcmring/include/mach/csp/dmacHw_reg.h
--- a/arch/arm/mach-davinci/pm.c
+++ b/arch/arm/mach-davinci/pm.c
--- a/arch/arm/mach-dove/common.c
+++ b/arch/arm/mach-dove/common.c
--- a/arch/arm/mach-gemini/include/mach/hardware.h
+++ b/arch/arm/mach-gemini/include/mach/hardware.h
--- a/arch/arm/mach-imx/mach-pcm038.c
+++ b/arch/arm/mach-imx/mach-pcm038.c
--- a/arch/arm/mach-imx/pm-imx27.c
+++ b/arch/arm/mach-imx/pm-imx27.c
--- a/arch/arm/mach-kirkwood/openrd-setup.c
+++ b/arch/arm/mach-kirkwood/openrd-setup.c
--- a/arch/arm/mach-lpc32xx/pm.c
+++ b/arch/arm/mach-lpc32xx/pm.c
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
--- a/arch/arm/mach-msm/headsmp.S
+++ b/arch/arm/mach-msm/headsmp.S
--- a/arch/arm/mach-msm/hotplug.c
+++ b/arch/arm/mach-msm/hotplug.c
--- a/arch/arm/mach-msm/include/mach/entry-macro-qgic.S
+++ b/arch/arm/mach-msm/include/mach/entry-macro-qgic.S
--- a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
--- a/arch/arm/mach-msm/io.c
+++ b/arch/arm/mach-msm/io.c
--- a/arch/arm/mach-msm/platsmp.c
+++ b/arch/arm/mach-msm/platsmp.c
--- a/arch/arm/mach-msm/scm-boot.c
+++ b/arch/arm/mach-msm/scm-boot.c
--- a/arch/arm/mach-msm/scm-boot.h
+++ b/arch/arm/mach-msm/scm-boot.h
--- a/arch/arm/mach-msm/scm.c
+++ b/arch/arm/mach-msm/scm.c
--- a/arch/arm/mach-msm/scm.h
+++ b/arch/arm/mach-msm/scm.h
--- a/Show more
+++ b/Show more