]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge tag 'reset-for-4.12-2' of git://git.pengutronix.de/git/pza/linux into next...
authorOlof Johansson <olof@lixom.net>
Wed, 19 Apr 2017 12:30:35 +0000 (05:30 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 19 Apr 2017 12:30:35 +0000 (05:30 -0700)
Reset controller changes for v4.12, part 2

Add reset lines for the NAND and eMMC contollers on LD11/LD20 SoCs.

* tag 'reset-for-4.12-2' of git://git.pengutronix.de/git/pza/linux:
  reset: uniphier: add NAND and eMMC reset control

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge