]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
Merge branch 'sunxi/drivers-for-3.16' of https://github.com/mripard/linux into next...
authorOlof Johansson <olof@lixom.net>
Wed, 21 May 2014 21:42:56 +0000 (14:42 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 21 May 2014 21:42:56 +0000 (14:42 -0700)
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>

Trivial merge