Merge tag 'imx-fixes-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...
authorOlof Johansson <olof@lixom.net>
Sun, 19 Jun 2016 05:18:45 +0000 (22:18 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 19 Jun 2016 05:18:45 +0000 (22:18 -0700)
commit7752b0d5dcfdb6dcaffb8c83b1ba2af2ef81a81d
tree626e3b1ab17b7318de1ce46cb77bcadd4a29d18e
parenta0110642e6efc49cc214a67b9749a791b0ca045d
parent20c15226d1c73150c4d9107301cac5dda0b7f995
Merge tag 'imx-fixes-4.7' of git://git./linux/kernel/git/shawnguo/linux into fixes

The i.MX fixes for 4.7:
 - Correct Micrel PHY mask to fix the issue that i.MX6UL ethernet works
   in U-Boot but not in kernel.

* tag 'imx-fixes-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx6ul: Fix Micrel PHY mask

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