| commit | ed99885ccb89471f52d34b74b15fc9059bf07504 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Wed May 21 14:42:56 2014 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Wed May 21 14:42:56 2014 -0700 |
| tree | f032dab24235b27e2f75c0046c445f23e5329d79 | |
| parent | 02be9746e3169f92010872d111eef51404ee99c5 [diff] | |
| parent | cd90f0cf4454861a4f87bdfdcf01e8b98cc94869 [diff] |
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>