linux/Documentation/devicetree/bindings
Linus Torvalds 5f3d2f2e1a Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc updates from Benjamin Herrenschmidt:
 "Some highlights in addition to the usual batch of fixes:

   - 64TB address space support for 64-bit processes by Aneesh Kumar

   - Gavin Shan did a major cleanup & re-organization of our EEH support
     code (IBM fancy PCI error handling & recovery infrastructure) which
     paves the way for supporting different platform backends, along
     with some rework of the PCIe code for the PowerNV platform in order
     to remove home made resource allocations and instead use the
     generic code (which is possible after some small improvements to it
     done by Gavin).

   - Uprobes support by Ananth N Mavinakayanahalli

   - A pile of embedded updates from Freescale folks, including new SoC
     and board supports, more KVM stuff including preparing for 64-bit
     BookE KVM support, ePAPR 1.1 updates, etc..."

Fixup trivial conflicts in drivers/scsi/ipr.c

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (146 commits)
  powerpc/iommu: Fix multiple issues with IOMMU pools code
  powerpc: Fix VMX fix for memcpy case
  driver/mtd:IFC NAND:Initialise internal SRAM before any write
  powerpc/fsl-pci: use 'Header Type' to identify PCIE mode
  powerpc/eeh: Don't release eeh_mutex in eeh_phb_pe_get
  powerpc: Remove tlb batching hack for nighthawk
  powerpc: Set paca->data_offset = 0 for boot cpu
  powerpc/perf: Sample only if SIAR-Valid bit is set in P7+
  powerpc/fsl-pci: fix warning when CONFIG_SWIOTLB is disabled
  powerpc/mpc85xx: Update interrupt handling for IFC controller
  powerpc/85xx: Enable USB support in p1023rds_defconfig
  powerpc/smp: Do not disable IPI interrupts during suspend
  powerpc/eeh: Fix crash on converting OF node to edev
  powerpc/eeh: Lock module while handling EEH event
  powerpc/kprobe: Don't emulate store when kprobe stwu r1
  powerpc/kprobe: Complete kprobe and migrate exception frame
  powerpc/kprobe: Introduce a new thread flag
  powerpc: Remove unused __get_user64() and __put_user64()
  powerpc/eeh: Global mutex to protect PE tree
  powerpc/eeh: Remove EEH PE for normal PCI hotplug
  ...
2012-10-06 03:16:12 +09:00
..
arm Minor libata updates, nothing notable. 2012-10-02 18:23:35 -07:00
ata Merge branch 'for-v3.7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping 2012-10-02 19:13:12 -07:00
bus drivers: bus: add a new driver for omap-ocp2scp 2012-08-22 14:31:49 +02:00
c6x C6X: devicetree support 2011-10-06 19:47:33 -04:00
clock Update arch-vt8500 and drivers to device tree and 2012-09-23 21:51:39 -07:00
cpufreq cpufreq: Add a generic cpufreq-cpu0 driver 2012-09-09 22:06:34 +02:00
crypto rtc: snvs: add Freescale rtc-snvs driver 2012-10-06 03:05:01 +09:00
dma Merge branch 'for-v3.7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping 2012-10-02 19:13:12 -07:00
fb video: mxsfb: add simple device tree probe 2012-07-03 13:22:37 +08:00
gpio So this is the LW GPIO patch stack for v3.7: 2012-10-02 16:05:10 -07:00
hwmon hwmon: (ads1015) Make gain and datarate configurable 2011-03-21 17:59:37 +01:00
i2c Documentation: dt: i2c: trivial-devices: Update for tmp102 2012-09-07 19:18:35 +02:00
input Linux 3.6-rc4 2012-09-04 22:57:19 -07:00
interrupt-controller Devicetree updates for 3.7 2012-10-03 09:44:08 -07:00
iommu iommu/tegra: smmu: Add device tree support for SMMU 2012-06-25 13:50:43 +02:00
lpddr2 Documentation: dt: device tree bindings for LPDDR2 memories 2012-09-07 19:18:37 +02:00
media ARM: EXYNOS: Adds G-Scaler device from Device Tree 2012-09-07 14:13:08 +09:00
memory-controllers/ti Documentation: dt: emif: device tree bindings for TI's EMIF sdram controller 2012-09-07 19:18:38 +02:00
mfd MFD bits for the 3.7 merge window. 2012-10-05 12:01:30 +09:00
mips/cavium MIPS: Octeon: Add device tree source files. 2012-07-23 13:54:52 +01:00
misc Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2012-10-06 03:16:12 +09:00
mmc ARM: dts: imx51-babbage: fix esdhc cd/wp properties 2012-08-23 21:10:23 +08:00
mtd MTD: pxa3xx-nand: add devicetree bindings 2012-08-16 16:14:24 +08:00
net Merge branch 'for-v3.7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping 2012-10-02 19:13:12 -07:00
nvec dt: name all Tegra binding docs consistently 2012-06-11 11:48:42 -06:00
pci
pinctrl These are the bulk pinctrl changes for kernel v3.7: 2012-10-02 16:20:20 -07:00
power PM / OPP: Initialize OPP table from device tree 2012-09-09 22:06:33 +02:00
power_supply max17042_battery: Make it possible to instantiate driver from DT 2012-03-26 20:40:51 +04:00
powerpc powerpc: Update Integrated Flash controller device tree bindings 2012-09-12 14:57:10 -05:00
pwm devicetree: pwm: mxs-pwm.txt: Fix reg field annotation 2012-09-06 11:01:43 -05:00
regulator MFD bits for the 3.7 merge window. 2012-10-05 12:01:30 +09:00
rtc rtc: snvs: add Freescale rtc-snvs driver 2012-10-06 03:05:01 +09:00
serial devicetree: serial: Add documentation for imx serial 2012-09-06 11:01:46 -05:00
serio
sound Documentation: Define the MSP Driver Device Tree bindings 2012-09-20 09:10:59 +02:00
spi Merge branches 'spi-drivers' and 'spi-mxs' into spi-next 2012-09-28 14:05:29 +01:00
staging staging: drm/imx: Add devicetree binding documentation 2012-09-21 09:17:06 -07:00
thermal drivers/thermal/spear_thermal.c: add Device Tree probing capability 2012-06-02 01:49:38 -04:00
timer ARM: bcm2835: add system timer 2012-09-19 19:08:46 -06:00
tty/serial Update arch-vt8500 and drivers to device tree and 2012-09-23 21:51:39 -07:00
usb ARM: soc: device tree updates 2012-10-01 18:28:06 -07:00
video MFD bits for the 3.7 merge window. 2012-10-05 12:01:30 +09:00
virtio virtio: Add platform bus driver for memory mapped virtio device 2011-11-02 11:41:01 +10:30
w1 onewire: w1-gpio: add DT bindings 2012-08-16 10:00:23 -07:00
watchdog ARM: arm-soc Marvell Orion device-tree updates 2012-08-02 11:50:24 -07:00
x86
eeprom.txt
marvell.txt
open-pic.txt powerpc: Document the Open PIC device tree binding 2011-03-21 11:00:52 +11:00
resource-names.txt of/irq: Add interrupts-names property to name an irq resource 2012-01-04 00:33:15 -07:00
vendor-prefixes.txt ARM: soc: device tree updates 2012-10-01 18:28:06 -07:00
xilinx.txt