From patchwork Thu Nov 10 01:00:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Brown X-Patchwork-Id: 124767 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D8CEDB6F68 for ; Thu, 10 Nov 2011 12:02:47 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1ROJ02-0006Tq-6P; Thu, 10 Nov 2011 01:00:14 +0000 Received: from wolverine01.qualcomm.com ([199.106.114.254]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1ROIzz-0006Tk-51 for linux-arm-kernel@lists.infradead.org; Thu, 10 Nov 2011 01:00:12 +0000 X-IronPort-AV: E=McAfee;i="5400,1158,6525"; a="136268396" Received: from pdmz-css-vrrp.qualcomm.com (HELO mostmsg01.qualcomm.com) ([199.106.114.130]) by wolverine01.qualcomm.com with ESMTP/TLS/ADH-AES256-SHA; 09 Nov 2011 17:00:04 -0800 Received: from huya.qualcomm.com (pdmz-snip-v218.qualcomm.com [192.168.218.1]) by mostmsg01.qualcomm.com (Postfix) with ESMTPA id A755F10004D5; Wed, 9 Nov 2011 17:00:04 -0800 (PST) Date: Wed, 9 Nov 2011 17:00:03 -0800 From: David Brown To: Arnd Bergmann Subject: [GIT PULL] msm fixes for 3.2 Message-ID: <20111110010003.GA785@huya.qualcomm.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Spam-Note: CRM114 invocation failed X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [199.106.114.254 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Nicolas Pitre , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Russell King , Olof Johansson , Thomas Gleixner , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org This contains an additional fix from https://lkml.org/lkml/2011/11/1/345 so that pull request can be ignored. The following changes since commit b4beb4bf9934d151bf4581a54ae028927374cb2a: Merge branch 'for-linus/i2c-3.2' of git://git.fluff.org/bjdooks/linux (2011-11-01 15:07:19 -0700) are available in the git repository at: git://codeaurora.org/quic/kernel/davidb/linux-msm.git msm-fix Marc Zyngier (1): ARM: msm: fix compilation flags for MSM_SCM Stephen Boyd (1): msm: boards: Fix fallout from removal of machine_desc in fixup arch/arm/mach-msm/Makefile | 2 ++ arch/arm/mach-msm/board-msm7x30.c | 4 ++-- arch/arm/mach-msm/board-msm8960.c | 4 ++-- arch/arm/mach-msm/board-msm8x60.c | 4 ++-- arch/arm/mach-msm/scm.c | 3 +++ 5 files changed, 11 insertions(+), 6 deletions(-)