Merge tag 'sunxi-fixes-for-4.9' of https://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Fri, 18 Nov 2016 00:43:38 +0000 (16:43 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 18 Nov 2016 00:43:38 +0000 (16:43 -0800)
commit9883ed4433b358528e1a41e56ae01a4b02a1dde3
tree657c0481e4bd567fcca88503c0d125c90669b399
parentc28aedec503d42a2b9f86102e3ae9d03bb54079e
parentb7f865ede20c87073216f77fe97f6fc56666e3da
Merge tag 'sunxi-fixes-for-4.9' of https://git./linux/kernel/git/mripard/linux into fixes

Allwinner fixes for 4.9

A fix to reintroduce missing pinmux options that turned out not to be
optional.

* tag 'sunxi-fixes-for-4.9' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: dts: sun8i: fix the pinmux for UART1

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