diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-19 23:19:17 +0100 | 
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-19 23:19:17 +0100 | 
| commit | 7d9e89c7c4812f74e6540e015d36f88295ff0b60 (patch) | |
| tree | f3633f9a739872309307844579fe9dfaf63cd5d3 /lib/pm-notifier-error-inject.c | |
| parent | 2184d566c1f27864971446654e1a596622de42d9 (diff) | |
| parent | f5ed9ccc4c2dc275a13b765c88fa13211f60b57f (diff) | |
Merge tag 'mvebu-dt-3.19' of git://git.infradead.org/linux-mvebu into next/dt
Pull "mvebu DT changes for v3.19" from Jason Cooper:
 - mvebu
    - ReadyNAS 102 leds, esata
    - ReadyNAS 2120 esata
    - Add cache-unified for Aurora L2 node
    - Add ref clk for timer and watchdog on Armada 375
    - Cleanup Armada XP pinctrl for GigE
    - Add RGMII pinctrl, i2c eeprom, and fix 74hc595 counter on Lenovo ix4-300d
 - kirkwood
    - Add DLink DIR665 and it's DSA configuration
* tag 'mvebu-dt-3.19' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: armada-xp: Fix 74hc595 count for Lenovo ix4-300d
  ARM: mvebu: armada-xp: Add I2C eeprom on Lenovo ix4-300d
  ARM: mvebu: armada-xp: Add RGMII pinctrl to Lenovo ix4-300d
  ARM: mvebu: armada-xp: Add GE0 pinctrl settings for GMII
  ARM: mvebu: armada-xp: Move GE0/1 pinctrl settings for RGMII
  ARM: mvebu: armada-xp: Use pinctrl node alias
  ARM: mvebu: armada-xp: Add node alias to pinctrl and add base address
  ARM: mvebu: armada-xp: Consolidate pinctrl node
  ARM: Kirkwood: DIR665: Instantiate Distributed Switch Architecture
  ARM: Kirkwood: Add support for DLink DIR665
  ARM: mvebu: Enable rear eSATA ports of NETGEAR ReadyNAS 2120
  ARM: mvebu: Enable the reference clock for timer and watchdog on Armada 375 SoC
  arm: mvebu: Clarify (e)SATA ports info in NETGEAR ReadyNAS 102 .dts file
  arm: mvebu: Fix LED color in NETGEAR ReadyNAS 102 .dts file
  ARM: mvebu: Fix the Aurora L2 cache node with the required cache-unified property
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'lib/pm-notifier-error-inject.c')
0 files changed, 0 insertions, 0 deletions
