Greg Kroah-Hartman 7da59d2fe3 Merge v3.6-rc3 into 'char-misc-next' ...

This resolves a conflict in:
	drivers/misc/mei/interrupt.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2012-08-27 09:09:07 -07:00

..

arm

ARM: arm-soc Marvell Orion device-tree updates

2012-08-02 11:50:24 -07:00

ata

ARM: arm-soc Marvell Orion device-tree updates

2012-08-02 11:50:24 -07:00

c6x

C6X: devicetree support

2011-10-06 19:47:33 -04:00

clock

clk: add highbank clock support

2012-07-11 17:58:47 -07:00

crypto

crypto: picoxcell - support for device tree matching

2011-08-10 19:00:26 +08:00

dma

arm-soc: device tree conversions, part 2

2012-05-26 12:57:47 -07:00

fb

video: mxsfb: add simple device tree probe

2012-07-03 13:22:37 +08:00

gpio

ARM: arm-soc Marvell Orion device-tree updates

2012-08-02 11:50:24 -07:00

hwmon

hwmon: (ads1015) Make gain and datarate configurable

2011-03-21 17:59:37 +01:00

i2c

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2012-07-30 11:45:52 -07:00

input

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2012-07-26 12:59:53 -07:00

iommu

iommu/tegra: smmu: Add device tree support for SMMU

2012-06-25 13:50:43 +02:00

mfd

MFD bits for the 3.6 merge window.

2012-07-30 12:41:17 -07:00

mips/cavium

MIPS: Octeon: Add device tree source files.

2012-07-23 13:54:52 +01:00

misc

misc: at25: Parse dt settings

2012-06-14 17:23:04 -07:00

mmc

arm-soc: general cleanups

2012-07-23 16:04:15 -07:00

mtd

Merge branch 'v3.5-rc7-fixes' of git://github.com/lunn/linux into fixes

2012-07-25 21:37:09 +02:00

net

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2012-07-30 11:45:52 -07:00

nvec

dt: name all Tegra binding docs consistently

2012-06-11 11:48:42 -06:00

pci

…

pinctrl

Pin control changes for v3.6:

2012-07-24 14:05:46 -07:00

power_supply

max17042_battery: Make it possible to instantiate driver from DT

2012-03-26 20:40:51 +04:00

powerpc

powerpc: document the FSL MPIC message register binding

2012-03-16 16:15:28 -05:00

pwm

pwm: add lpc32xx PWM support

2012-07-23 13:24:05 +02:00

regulator

regulator: tps6586x: correct vin pin for sm0/sm1/sm2

2012-08-07 18:10:26 +01:00

rtc

arm-soc: timer updates

2012-07-23 16:21:23 -07:00

serial

MIPS: Octeon: Add device tree source files.

2012-07-23 13:54:52 +01:00

serio

…

sound

dt: name all Tegra binding docs consistently

2012-06-11 11:48:42 -06:00

spi

spi: Updates for 3.6

2012-07-27 16:45:04 +02:00

staging/iio/adc

iio: Add device tree support to LPC32xx ADC

2012-04-24 11:04:07 -07:00

thermal

drivers/thermal/spear_thermal.c: add Device Tree probing capability

2012-06-02 01:49:38 -04:00

tty/serial

TTY/Serial patches for 3.6-rc1

2012-07-27 12:52:03 -07:00

usb

USB patches for 3.6-rc1

2012-07-26 10:23:47 -07:00

video/backlight

pwm-backlight: Add rudimentary device tree support

2012-07-23 13:23:52 +02: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

x86: dt: Correct local apic documentation in device tree bindings

2011-02-28 09:58:06 +01:00

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

of: Add Avionic Design vendor prefix

2012-06-13 13:34:39 -05:00

xilinx.txt

…