From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Brown Subject: [GIT PULL 4/5] msm board changes Date: Thu, 13 Sep 2012 11:57:36 -0700 Message-ID: <20120913185736.GD30032@codeaurora.org> References: <20120913185342.GA29823@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from wolverine02.qualcomm.com ([199.106.114.251]:7108 "EHLO wolverine02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751360Ab2IMS5i (ORCPT ); Thu, 13 Sep 2012 14:57:38 -0400 Content-Disposition: inline In-Reply-To: <20120913185342.GA29823@codeaurora.org> Sender: linux-arm-msm-owner@vger.kernel.org List-Id: linux-arm-msm@vger.kernel.org To: arm@kernel.org Cc: Arnd Bergmann , Olof Johansson , Nicolas Pitre , Thomas Gleixner , Russell King , linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org The following changes since commit 28a33cbc24e4256c143dce96c7d93bf423229f92: Linux 3.5 (2012-07-21 13:58:29 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-board-for-3.7 for you to fetch changes up to 33fcb13dc543af610c7c930dbfeeed6e6ed02376: ARM: msm: Allow 8960 and 8660 to compile together (2012-09-13 11:17:47 -0700) ---------------------------------------------------------------- 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. ---------------------------------------------------------------- Stephen Boyd (2): ARM: msm: Allow msm_iomap-8x60 and msm_iomap-8960 to coexist ARM: msm: Allow 8960 and 8660 to compile together arch/arm/mach-msm/Kconfig | 8 ++++++-- arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 11 ----------- arch/arm/mach-msm/include/mach/msm_iomap.h | 3 +-- arch/arm/mach-msm/io.c | 2 -- 4 files changed, 7 insertions(+), 17 deletions(-) -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation