Merge tag 'berlin-driver-3.19-1' of git://git.infradead.org/users/hesselba/linux...
authorOlof Johansson <olof@lixom.net>
Sun, 9 Nov 2014 00:41:37 +0000 (16:41 -0800)
committerOlof Johansson <olof@lixom.net>
Sun, 9 Nov 2014 00:41:37 +0000 (16:41 -0800)
Merge "ARM: berlin: Driver changes for v3.19 (round 1)" from Sebastian
Hesselbarth:

Berlin Driver changes for v3.19 (round 1)
- Reset driver, Acked by Philipp Zabel

* tag 'berlin-driver-3.19-1' of git://git.infradead.org/users/hesselba/linux-berlin:
  reset: add the Berlin reset controller driver

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

Trivial merge