Merge tag 'omap-for-v3.11/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
Omap fixes and minor defconfig updates that would be good to
get in before -rc1.
* tag 'omap-for-v3.11/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: omap2plus_defconfig: Enable appended DTB support
ARM: OMAP2+: Enable TI_EDMA in omap2plus_defconfig
ARM: OMAP2+: omap2plus_defconfig: enable DRA752 thermal support by default
ARM: OMAP2+: omap2plus_defconfig: enable TI bandgap driver
ARM: OMAP2+: devices: remove duplicated include from devices.c
ARM: OMAP3: igep0020: Set DSS pins in correct mux mode.
ARM: OMAP2+: N900: enable N900-specific drivers even if device tree is enabled
ARM: OMAP2+: Cocci spatch "ptr_ret.spatch"
ARM: OMAP2+: Remove obsolete Makefile line
ARM: OMAP5: Enable Cortex A15 errata 798181
ARM: scu: provide inline dummy functions when SCU is not present
ARM: OMAP4: sleep: build OMAP4 specific functions only for OMAP4
ARM: OMAP2+: timer: initialize before using oh_name
Signed-off-by: Olof Johansson <olof@lixom.net>
Add/move/change conflicts in arch/arm/mach-omap2/Kconfig resolved.
| -rw-r--r-- | Documentation/ABI/testing/sysfs-bus-acpi | 58 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-bus-event_source-devices-events | 32 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-bus-event_source-devices-format | 6 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-class-devfreq | 20 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-devices-online | 20 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-devices-sun | 2 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-devices-system-cpu | 15 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-firmware-acpi | 10 | |
| -rw-r--r-- | Documentation/CodingStyle | 3 | |
| -rw-r--r-- | Documentation/DocBook/device-drivers.tmpl | 4 | |
| -rw-r--r-- | Documentation/DocBook/genericirq.tmpl | 13 | |
| -rw-r--r-- | Documentation/DocBook/kernel-locking.tmpl | 7 | |
| -rw-r--r-- | Documentation/RCU/checklist.txt | 6 | |
| -rw-r--r-- | Documentation/RCU/torture.txt | 6 | |
| -rw-r--r-- | Documentation/RCU/trace.txt | 100 | |
| -rw-r--r-- | Documentation/RCU/whatisRCU.txt | 22 | |
| -rw-r--r-- | Documentation/accounting/getdelays.c | 4 | |
| -rw-r--r-- | Documentation/acpi/apei/einj.txt | 9 | |
| -rw-r--r-- | Documentation/acpi/namespace.txt | 395 | |
| -rw-r--r-- | Documentation/acpi/video_extension.txt | 106 | |
| -rw-r--r-- | Documentation/arm64/memory.txt | 7 | |
| -rw-r--r-- | Documentation/cgroups/cpusets.txt | 2 | |
| -rw-r--r-- | Documentation/cgroups/memory.txt | 7 | |
| -rw-r--r-- | Documentation/cpu-freq/cpu-drivers.txt | 10 | |
| -rw-r--r-- | Documentation/cpu-hotplug.txt | 6 | |
| -rw-r--r-- | Documentation/crypto/async-tx-api.txt | 1 | |
| -rw-r--r-- | Documentation/devices.txt | 3 | |
| -rw-r--r-- | Documentation/devicetree/bindings/arm/l2cc.txt | 3 | |
| -rw-r--r-- | Documentation/devicetree/bindings/ata/ahci-platform.txt | 5 | |
| -rw-r--r-- | Documentation/devicetree/bindings/clock/nspire-clock.txt | 24 | |
| -rw-r--r-- | Documentation/devicetree/bindings/clock/rockchip.txt | 74 | |
| -rw-r--r-- | Documentation/devicetree/bindings/clock/silabs,si5351.txt | 5 | |
| -rw-r--r-- | Documentation/devicetree/bindings/clock/sunxi.txt | 117 | |
| -rw-r--r-- | Documentation/devicetree/bindings/clock/sunxi/sun4i-a10-gates.txt | 93 | |
| -rw-r--r-- | Documentation/devicetree/bindings/clock/sunxi/sun5i-a13-gates.txt | 58 | |
| -rw-r--r-- | Documentation/devicetree/bindings/clock/vt8500.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/gpio/gpio-xilinx.txt | 48 | |
| -rw-r--r-- | Documentation/devicetree/bindings/hwmon/g762.txt | 47 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/ina2xx.txt | 22 | |
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/abilis,tb10x-ictl.txt | 38 | |
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/marvell,orion-intc.txt | 48 | |
| -rw-r--r-- | Documentation/devicetree/bindings/leds/leds-lp55xx.txt | 147 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/arizona.txt | 62 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/max77693.txt | 55 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/fsl,vf610-pinctrl.txt | 41 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/img,tz1090-pdc-pinctrl.txt | 127 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/img,tz1090-pinctrl.txt | 227 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/marvell,dove-pinctrl.txt | 49 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt | 48 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt | 3 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/pinctrl-st.txt | 110 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt | 153 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt | 97 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/ste,abx500.txt | 352 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pps/pps-gpio.txt | 20 | |
| -rw-r--r-- | Documentation/devicetree/bindings/regulator/lp872x.txt | 160 | |
| -rw-r--r-- | Documentation/devicetree/bindings/regulator/max8973-regulator.txt | 21 | |
| -rw-r--r-- | Documentation/devicetree/bindings/regulator/regulator.txt | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/regulator/ti-abb-regulator.txt | 128 | |
| -rw-r--r-- | Documentation/devicetree/bindings/sound/adi,adau1701.txt | 35 | |
| -rw-r--r-- | Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt | 46 | |
| -rw-r--r-- | Documentation/devicetree/bindings/sound/mxs-saif.txt | 17 | |
| -rw-r--r-- | Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5640.txt | 71 | |
| -rw-r--r-- | Documentation/devicetree/bindings/sound/rt5640.txt | 30 | |
| -rw-r--r-- | Documentation/devicetree/bindings/sound/sgtl5000.txt | 3 | |
| -rw-r--r-- | Documentation/devicetree/bindings/sound/spdif-receiver.txt | 10 | |
| -rw-r--r-- | Documentation/devicetree/bindings/sound/spdif-transmitter.txt | 10 | |
| -rw-r--r-- | Documentation/devicetree/bindings/sound/ssm2518.txt | 20 | |
| -rw-r--r-- | Documentation/devicetree/bindings/sound/ti,tas5086.txt | 11 | |
| -rw-r--r-- | Documentation/devicetree/bindings/sound/wm8962.txt | 23 | |
| -rw-r--r-- | Documentation/devicetree/bindings/spi/omap-spi.txt | 27 | |
| -rw-r--r-- | Documentation/filesystems/Locking | 35 | |
| -rw-r--r-- | Documentation/filesystems/proc.txt | 7 | |
| -rw-r--r-- | Documentation/filesystems/vfs.txt | 49 | |
| -rw-r--r-- | Documentation/hwmon/ds1621 | 144 | |
| -rw-r--r-- | Documentation/hwmon/g762 | 65 | |
| -rw-r--r-- | Documentation/hwmon/ina2xx | 4 | |
| -rw-r--r-- | Documentation/i2c/busses/i2c-piix4 | 2 | |
| -rw-r--r-- | Documentation/ioctl/ioctl-number.txt | 1 | |
| -rw-r--r-- | Documentation/kdump/kdump.txt | 31 | |
| -rw-r--r-- | Documentation/kernel-parameters.txt | 38 | |
| -rw-r--r-- | Documentation/kernel-per-CPU-kthreads.txt | 47 | |
| -rw-r--r-- | Documentation/pinctrl.txt | 39 | |
| -rw-r--r-- | Documentation/power/pm_qos_interface.txt | 50 | |
| -rw-r--r-- | Documentation/power/runtime_pm.txt | 20 | |
| -rw-r--r-- | Documentation/power/video_extension.txt | 37 | |
| -rw-r--r-- | Documentation/rapidio/rapidio.txt | 98 | |
| -rw-r--r-- | Documentation/rapidio/sysfs.txt | 1 | |
| -rw-r--r-- | Documentation/rt-mutex-design.txt | 2 | |
| -rw-r--r-- | Documentation/rtc.txt | 7 | |
| -rw-r--r-- | Documentation/scheduler/sched-domains.txt | 4 | |
| -rw-r--r-- | Documentation/sound/alsa/HD-Audio-Models.txt | 40 | |
| -rw-r--r-- | Documentation/spinlocks.txt | 2 | |
| -rw-r--r-- | Documentation/sysctl/kernel.txt | 50 | |
| -rw-r--r-- | Documentation/timers/NO_HZ.txt | 79 | |
| -rw-r--r-- | Documentation/trace/events-nmi.txt | 43 | |
| -rw-r--r-- | Documentation/trace/events-power.txt | 31 | |
| -rw-r--r-- | Documentation/virtual/kvm/api.txt | 66 | |
| -rw-r--r-- | Documentation/virtual/kvm/mmu.txt | 91 | |
| -rw-r--r-- | Documentation/virtual/uml/UserModeLinux-HOWTO.txt | 4 | |
| -rw-r--r-- | Documentation/vm/pagemap.txt | 3 | |
| -rw-r--r-- | Documentation/vm/soft-dirty.txt | 36 | |
| -rw-r--r-- | Documentation/ww-mutex-design.txt | 344 | |
| -rw-r--r-- | Documentation/x86/early-microcode.txt | 11 | |
| -rw-r--r-- | MAINTAINERS | 64 | |
| -rw-r--r-- | arch/Kconfig | 3 | |
| -rw-r--r-- | arch/alpha/include/asm/mmzone.h | 2 | |
| -rw-r--r-- | arch/alpha/include/uapi/asm/fcntl.h | 1 | |
| -rw-r--r-- | arch/alpha/kernel/sys_nautilus.c | 4 | |
| -rw-r--r-- | arch/alpha/mm/init.c | 41 | |
| -rw-r--r-- | arch/alpha/mm/numa.c | 40 | |
| -rw-r--r-- | arch/arc/Kconfig | 8 | |
| -rw-r--r-- | arch/arc/Makefile | 28 | |
| -rw-r--r-- | arch/arc/configs/fpga_defconfig | 2 | |
| -rw-r--r-- | arch/arc/configs/nsimosci_defconfig | 2 | |
| -rw-r--r-- | arch/arc/configs/tb10x_defconfig | 2 | |
| -rw-r--r-- | arch/arc/include/asm/arcregs.h | 127 | |
| -rw-r--r-- | arch/arc/include/asm/bug.h | 5 | |
| -rw-r--r-- | arch/arc/include/asm/cache.h | 26 | |
| -rw-r--r-- | arch/arc/include/asm/cacheflush.h | 13 | |
| -rw-r--r-- | arch/arc/include/asm/defines.h | 56 | |
| -rw-r--r-- | arch/arc/include/asm/entry.h | 521 | |
| -rw-r--r-- | arch/arc/include/asm/irq.h | 2 | |
| -rw-r--r-- | arch/arc/include/asm/irqflags.h | 20 | |
| -rw-r--r-- | arch/arc/include/asm/kgdb.h | 4 | |
| -rw-r--r-- | arch/arc/include/asm/kprobes.h | 6 | |
| -rw-r--r-- | arch/arc/include/asm/mmu.h | 44 | |
| -rw-r--r-- | arch/arc/include/asm/page.h | 7 | |
| -rw-r--r-- | arch/arc/include/asm/pgtable.h | 6 | |
| -rw-r--r-- | |
