diff options
author | Olof Johansson <olof@lixom.net> | 2014-09-24 01:11:05 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-09-24 01:11:25 -0400 |
commit | 8adc36bcd374dc7381d15e654215dd1f548ccbef (patch) | |
tree | afc86512891f75b04efa0273694a977a77529a86 /MAINTAINERS | |
parent | 96bdd9aeb2cbc5eaae586f4d43badd072611fcb1 (diff) | |
parent | d27704d1ec2f9ba06247b402c58a6f2febecef78 (diff) |
Merge tag 'dt-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Merge "omap dts changes for v3.18 merge window" from Tony Lindgren:
Changes for .dts files for omaps for v3.18 merge window:
- Updates for gta04 to add gta04a3 model
- Add support for Tehnexion TAO3530 boards
- Regulator names for beaglebone
- Pinctrl related updates for omap5, dra7 and am437
- Model name fix for sbc-t54
- Enable mailbox for various omaps
* tag 'dt-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (291 commits)
ARM: dts: OMAP2+: Add sub mailboxes device node information
ARM: dts: dra7-evm: Mark uart1 rxd as wakeup capable
ARM: dts: OMAP5 / DRA7: switch over to interrupts-extended property for UART
ARM: dts: AM437x: switch to compatible pinctrl
ARM: dts: DRA7: switch to compatible pinctrl
ARM: dts: OMAP5: switch to compatible pinctrl
ARM: dts: am335x-boneblack: Add names for remaining regulators
ARM: dts: sbc-t54: fix model property
ARM: dts: omap5.dtsi: add DSS RFBI node
ARM: dts: omap3: Add HEAD acoustics omap3-ha.dts and omap3-ha-lcd.dts (TAO3530 based)
ARM: dts: omap3: Add Technexion Thunder support (TAO3530 SOM based)
ARM: dts: omap3: Add Technexion TAO3530 SOM omap3-tao3530.dtsi
ARM: OMAP2+: tao3530: Add pdata-quirk for the mmc2 internal clock
ARM: OMAP2+: board-generic: add support for AM57xx family
ARM: dts: dra72-evm: Add tps65917 PMIC node
ARM: dts: dra72-evm: Enable I2C1 node
Linux 3.17-rc3
unicore32: Fix build error
vexpress/spc: fix a build warning on array bounds
spi: sh-msiof: Fix transmit-only DMA transfers
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index dd19acdb618a..24156ffc4756 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -1279,8 +1279,13 @@ M: Heiko Stuebner <heiko@sntech.de> | |||
1279 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 1279 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
1280 | L: linux-rockchip@lists.infradead.org | 1280 | L: linux-rockchip@lists.infradead.org |
1281 | S: Maintained | 1281 | S: Maintained |
1282 | F: arch/arm/boot/dts/rk3* | ||
1282 | F: arch/arm/mach-rockchip/ | 1283 | F: arch/arm/mach-rockchip/ |
1284 | F: drivers/clk/rockchip/ | ||
1285 | F: drivers/i2c/busses/i2c-rk3x.c | ||
1283 | F: drivers/*/*rockchip* | 1286 | F: drivers/*/*rockchip* |
1287 | F: drivers/*/*/*rockchip* | ||
1288 | F: sound/soc/rockchip/ | ||
1284 | 1289 | ||
1285 | ARM/SAMSUNG ARM ARCHITECTURES | 1290 | ARM/SAMSUNG ARM ARCHITECTURES |
1286 | M: Ben Dooks <ben-linux@fluff.org> | 1291 | M: Ben Dooks <ben-linux@fluff.org> |
@@ -9560,6 +9565,14 @@ S: Maintained | |||
9560 | F: Documentation/usb/ohci.txt | 9565 | F: Documentation/usb/ohci.txt |
9561 | F: drivers/usb/host/ohci* | 9566 | F: drivers/usb/host/ohci* |
9562 | 9567 | ||
9568 | USB OVER IP DRIVER | ||
9569 | M: Valentina Manea <valentina.manea.m@gmail.com> | ||
9570 | M: Shuah Khan <shuah.kh@samsung.com> | ||
9571 | L: linux-usb@vger.kernel.org | ||
9572 | S: Maintained | ||
9573 | F: drivers/usb/usbip/ | ||
9574 | F: tools/usb/usbip/ | ||
9575 | |||
9563 | USB PEGASUS DRIVER | 9576 | USB PEGASUS DRIVER |
9564 | M: Petko Manolov <petkan@nucleusys.com> | 9577 | M: Petko Manolov <petkan@nucleusys.com> |
9565 | L: linux-usb@vger.kernel.org | 9578 | L: linux-usb@vger.kernel.org |