projects / linux / .git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e260818 e46b5a6)
Merge tag 'imx-fixes-4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...
authorArnd Bergmann <arnd@arndb.de>
Wed, 20 May 2015 15:51:28 +0000 (17:51 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 20 May 2015 15:51:28 +0000 (17:51 +0200)
commitaad3ae05bba3e95a9748919131760d93c4fb581b
tree525f86eade3f58b30a7ba592f601c86c4a40d50etree | snapshot
parente26081808edadfd257c6c9d81014e3b25e9a6118commit | diff
parente46b5a6470a5e2c8e1096f8f60887ac19949055bcommit | diff
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
https://github.com/torvalds/linux.git