| commit | 0e7d35c1fb708355ccef7cc4243509a3156c839b | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Sun Sep 16 17:39:21 2012 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Sun Sep 16 17:39:21 2012 -0700 |
| tree | 52271a65ddb479a0cb7d2878fcb0be398027aacc | |
| parent | a838ef7c0e80ac160fe99992c3456437be603690 [diff] | |
| parent | 33fcb13dc543af610c7c930dbfeeed6e6ed02376 [diff] |
Merge tag 'msm-board-for-3.7' of git://git.kernel.org/pub/scm/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