Merge tag 'sunxi-drivers-for-4.6' of https://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Mon, 29 Feb 2016 23:34:41 +0000 (00:34 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 29 Feb 2016 23:34:41 +0000 (00:34 +0100)
commit87023bc2ed11ea6b0944b34cc0281454c01832bf
tree4f3da1dde11f455a635f7f9c4166208a11aec1dd
parent3f2242ec4068fba76f353b384a79bcae81dd1e2d
parentfebe6569fae4b5e663f0a31d9dbf054d3b588ff5
Merge tag 'sunxi-drivers-for-4.6' of https://git./linux/kernel/git/mripard/linux into next/drivers

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

Some minor fixes for the RSB and SRAM controller drivers

* tag 'sunxi-drivers-for-4.6' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  drivers: soc: sunxi: Fix mask generation for SRAM mapping
  drivers: sunxi-rsb: fix error output type