diff options
| author | Olof Johansson <olof@lixom.net> | 2013-12-03 17:07:28 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-12-03 17:07:28 -0800 |
| commit | 25e9cd462baa8c5d8eda614a1cd205ae78c9a250 (patch) | |
| tree | 86b34ba4b05298c1717a5e849daf0d14d5dc9971 /net/unix/garbage.c | |
| parent | dab719392a82b5236f6336e9236d0fb2843360be (diff) | |
| parent | bd22bb23919e6727967e90eb89bb41ab790bcd2d (diff) | |
Merge tag 'mvebu-dt-3.14' of git://git.infradead.org/linux-mvebu into next/dt
From Jason Cooper:
mvebu DT changes for v3.14
- mvebu:
- remove unneeded OS-specific properties from led nodes
- add NAND controller to Armada boards
- add sata leds to readynas 104
- add gpio-poweroff to readynas duo v2
- kirkwood:
- comment cleanup in sheevaplug files
- default pinctrl for sdio
- sdio in guruplug is non-removable
- orion5x:
- typo fix
- dove:
- typo fix
- add PMU interrupt controller and RTC interrupt via same
* tag 'mvebu-dt-3.14' of git://git.infradead.org/linux-mvebu:
ARM: Dove: Add RTC interrupt via PMU interrupt controller.
ARM: Dove: Add DT node for PMU interrupt controller.
ARM: mvebu: Add DT entry for ReadyNAS Duo v2 to use gpio-poweroff driver
ARM: mvebu: Add RN104 SATA LEDs driven via NXP PCA9554 I2C to GPIO muxer
ARM: kirkwood: mark guruplug sdio as non-removable
ARM: kirkwood: provide pinctrl default to sdio nodes
ARM: dove: Fix typo in device_type property of phy node
ARM: orion5x: Fix typo in device_type property of phy node
ARM: mvebu: Enable NAND controller in Armada 370 Mirabox
ARM: mvebu: Enable NAND controller in Armada XP GP board
ARM: mvebu: Add support for NAND controller in Armada 370/XP
ARM: kirkwood: Cleanup comments in Sheevaplug dts files
ARM: mvebu: dts: remove unneeded linux,default-state from led nodes
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'net/unix/garbage.c')
0 files changed, 0 insertions, 0 deletions