Merge tag 'sunxi-drivers-for-3.16-2' of https://github.com/mripard/linux into next...
authorArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 22:46:39 +0000 (00:46 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 22:46:55 +0000 (00:46 +0200)
Allwinner drivers changes for 3.16, take 2

Add reset driver for the A31

* tag 'sunxi-drivers-for-3.16-2' of https://github.com/mripard/linux:
  power: reset: Add Allwinner A31 reset code

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

Trivial merge