From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 20 May 2015 15:51:28 +0000 (+0200)
Subject: Merge tag 'imx-fixes-4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=aad3ae05bba3e95a9748919131760d93c4fb581b;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge tag 'imx-fixes-4.1-2' of git://git./linux/kernel/git/shawnguo/linux into fixes

Merge "The i.MX fixes for 4.1, 2nd round" from Shawn Guo:

 - Fix i.MX27 FEC register map which overlaps the SCC (Security
   Controller) register space.
 - Fix i.MX27 DTB build rule which was wrongly controlled by i.MX31
   option.

* tag 'imx-fixes-4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: fix imx27 dtb build rule
  ARM: dts: imx27: only map 4 Kbyte for fec registers
---

aad3ae05bba3e95a9748919131760d93c4fb581b