diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2015-05-20 17:51:28 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-20 17:51:28 +0200 |
| commit | aad3ae05bba3e95a9748919131760d93c4fb581b (patch) | |
| tree | 525f86eade3f58b30a7ba592f601c86c4a40d50e /lib/jedec_ddr_data.c | |
| parent | Linux 4.1-rc4 (diff) | |
| parent | ARM: dts: fix imx27 dtb build rule (diff) | |
| download | wireguard-linux-aad3ae05bba3e95a9748919131760d93c4fb581b.tar.xz wireguard-linux-aad3ae05bba3e95a9748919131760d93c4fb581b.zip | |
Merge tag 'imx-fixes-4.1-2' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'lib/jedec_ddr_data.c')
0 files changed, 0 insertions, 0 deletions