Merge tag 'mvebu-drivers-3.15-2' of git://git.infradead.org/linux-mvebu into next...
authorArnd Bergmann <arnd@arndb.de>
Mon, 17 Mar 2014 10:14:34 +0000 (11:14 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 17 Mar 2014 10:14:34 +0000 (11:14 +0100)
commitcda88c8be59128da05d7cd58f9ce2754a1416516
treeb0af393c68b3d53fcdb100b8cb07af884bd3d4d5
parentde65ded49e95dbbd685b613a615f6821868e5b33
parent200c0a3e404beab02be83e5cbf111d26b9f6ce22
Merge tag 'mvebu-drivers-3.15-2' of git://git.infradead.org/linux-mvebu into next/drivers

Merge "mvebu drivers for v3.15" from Jason Cooper:

pull request #1:

 - mvebu mbus
    - use of_find_matching_node_and_match

 - rtc
    - use PTR_ERR_OR_ZERO in isl12057
    - work around issue in mv where date returned is 2038

 - kirkwood -> mach-mvebu
    - various Kconfig oneliners to allow building kirkwood in -mvebu/

pull request #2:

 - reset
    - re-use qnap-poweroff driver for Synology NASs

* tag 'mvebu-drivers-3.15-2' of git://git.infradead.org/linux-mvebu:
  Power: Reset: Generalize qnap-poweroff to work on Synology devices.
  drivers: Enable building of Kirkwood drivers for mach-mvebu
  rtc: mv: reset date if after year 2038
  rtc: isl12057: use PTR_ERR_OR_ZERO to fix coccinelle warnings
  bus: mvebu-mbus: make use of of_find_matching_node_and_match

Signed-off-by: Arnd Bergmann <arnd@arndb.de>