Merge tag 'socfpga-driver-update-for-3.16' of git://git.rocketboards.org/linux-socfpg...
authorOlof Johansson <olof@lixom.net>
Mon, 5 May 2014 22:13:33 +0000 (15:13 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 5 May 2014 22:13:33 +0000 (15:13 -0700)
Merge "drivers: Add reset driver for SOCFPGA" from Dinh Nguyen:

Add a reset driver for the SOCFPGA platform.

* tag 'socfpga-driver-update-for-3.16' of git://git.rocketboards.org/linux-socfpga-next:
  reset: add driver for socfpga

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

Trivial merge