From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 25 Nov 2016 21:36:00 +0000 (+0100)
Subject: Merge tag 'sunxi-fixes-for-4.9-2' of https://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v6.1~15325^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6895eae3537f363b34a8682629a9a1356ac3c94b;p=sdk%2Femulator%2Femulator-kernel.git

Merge tag 'sunxi-fixes-for-4.9-2' of https://git./linux/kernel/git/mripard/linux into fixes

Pull "Allwinner fixes for 4.9, second iteration" from Maxime Ripard:

A renaming of the GR8 DTSI and DTS to make it explicitly part of the sun5i
family.

* tag 'sunxi-fixes-for-4.9-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: gr8: Rename the DTSI and relevant DTS
---

6895eae3537f363b34a8682629a9a1356ac3c94b