]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/boards' into for-next
authorOlof Johansson <olof@lixom.net>
Mon, 17 Sep 2012 01:05:18 +0000 (18:05 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 17 Sep 2012 01:05:35 +0000 (18:05 -0700)
commit6587f57d672f68a73ba1fb86ad38ca9aebcc30b8
treebabbb1f91b3a1da2d441e5ac5fd467c301542fc2
parentdbae4f4cc161c27c1ffec179ea6a923040117f0f
parent0e7d35c1fb708355ccef7cc4243509a3156c839b
Merge branch 'next/boards' into for-next

* next/boards:
  ARM: msm: Allow 8960 and 8660 to compile together
  ARM: msm: Allow msm_iomap-8x60 and msm_iomap-8960 to coexist
arch/arm/arm-soc-for-next-contents.txt
arch/arm/mach-msm/Kconfig
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
arch/arm/mach-msm/io.c