From: Olof Johansson <olof@lixom.net>
Date: Wed, 21 May 2014 21:42:56 +0000 (-0700)
Subject: Merge branch 'sunxi/drivers-for-3.16' of https://github.com/mripard/linux into next... 
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~39^2~40^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed99885ccb89471f52d34b74b15fc9059bf07504;p=pandora-kernel.git

Merge branch 'sunxi/drivers-for-3.16' of https://github.com/mripard/linux into next/drivers

Merge "Allwinner drivers changes for 3.16" from Maxime Ripard:

Reset drivers for the A31, that have been merged with reset maintainer's
Acked-by.

* 'sunxi/drivers-for-3.16' of https://github.com/mripard/linux:
  reset: sunxi: allow MFD subdevices probe
  reset: sunxi: document sunxi's reset controllers bindings

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

ed99885ccb89471f52d34b74b15fc9059bf07504
Reading git-diff-tree failed