projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a838ef7 33fcb13)
Merge tag 'msm-board-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb...
authorOlof Johansson <olof@lixom.net>
Mon, 17 Sep 2012 00:39:21 +0000 (17:39 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 17 Sep 2012 00:39:21 +0000 (17:39 -0700)
commit0e7d35c1fb708355ccef7cc4243509a3156c839b
tree52271a65ddb479a0cb7d2878fcb0be398027aacctree | snapshot (tar.gz zip)
parenta838ef7c0e80ac160fe99992c3456437be603690commit | diff
parent33fcb13dc543af610c7c930dbfeeed6e6ed02376commit | diff
Merge tag 'msm-board-for-3.7' of git://git./linux/kernel/git/davidb/linux-msm into next/boards

Final parts to allow msm8660 and msm8960 to build into the same
kernel.  This won't work without the changes from msm-dt-for-3.7.

* tag 'msm-board-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm:
  ARM: msm: Allow 8960 and 8660 to compile together
  ARM: msm: Allow msm_iomap-8x60 and msm_iomap-8960 to coexist