From: Olof Johansson <olof@lixom.net>
Date: Mon, 17 Sep 2012 00:39:21 +0000 (-0700)
Subject: Merge tag 'msm-board-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb... 
X-Git-Tag: firefly_0821_release~3680^2~1959^2~1
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=0e7d35c1fb708355ccef7cc4243509a3156c839b;hp=-c;p=firefly-linux-kernel-4.4.55.git

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
---

0e7d35c1fb708355ccef7cc4243509a3156c839b