diff options
author | Olof Johansson <olof@lixom.net> | 2016-06-18 22:18:45 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2016-06-18 22:18:45 -0700 |
commit | 7752b0d5dcfdb6dcaffb8c83b1ba2af2ef81a81d (patch) | |
tree | 626e3b1ab17b7318de1ce46cb77bcadd4a29d18e /drivers/ide/ide-disk.c | |
parent | a0110642e6efc49cc214a67b9749a791b0ca045d (diff) | |
parent | 20c15226d1c73150c4d9107301cac5dda0b7f995 (diff) | |
download | talos-obmc-linux-7752b0d5dcfdb6dcaffb8c83b1ba2af2ef81a81d.tar.gz talos-obmc-linux-7752b0d5dcfdb6dcaffb8c83b1ba2af2ef81a81d.zip |
Merge tag 'imx-fixes-4.7' of git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'drivers/ide/ide-disk.c')
0 files changed, 0 insertions, 0 deletions