Greg Kroah-Hartman 2bcb132c69 Merge 3.6-rc6 into usb-next ...

This resolves the merge problems with:
	drivers/usb/dwc3/gadget.c
	drivers/usb/musb/tusb6010.c
that had been seen in linux-next.

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

2012-09-16 20:42:46 -07:00

..

arm

Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

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

ata

Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

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

c6x

…

clock

clk: add highbank clock support

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

crypto

…

dma

Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

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

Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

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

hwmon

…

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

Merge tag 'mfd-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

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: dts: imx51-babbage: fix esdhc cd/wp properties

2012-08-23 21:10:23 +08: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

Merge tag 'pinctrl-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

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

Merge tag 'timer' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

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

Merge tag 'spi-3.6' into v3.5-rc7-dt-v3

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

Merge tag 'tty-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

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

usb

USB: chipidea: add imx usbmisc support

2012-09-12 11:20:38 -07:00

video/backlight

pwm-backlight: Add rudimentary device tree support

2012-07-23 13:23:52 +02:00

virtio

…

watchdog

Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

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

x86

…

eeprom.txt

…

marvell.txt

…

open-pic.txt

…

resource-names.txt

…

vendor-prefixes.txt

of: Add Avionic Design vendor prefix

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

xilinx.txt

…