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)
commitb3d491e85dcd65d0ffdb60f56652e314cc278b55
treee1b9bfb099d70788ae2cd50d8c5dbb570e2ace05
parent34b16f74ebfb586d97e90bdb72f369aa5d8f16a1
parent1be7f5520a3885747174008d2905ae551f74ea78
Merge tag 'sunxi-drivers-for-3.16-2' of https://github.com/mripard/linux into next/drivers

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>