From patchwork Mon Mar 11 14:24:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 226565 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.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6C25F2C02B9 for ; Tue, 12 Mar 2013 01:27:37 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UF3e1-000704-PO; Mon, 11 Mar 2013 14:24:05 +0000 Received: from am1ehsobe005.messaging.microsoft.com ([213.199.154.208] helo=am1outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UF3do-0006yO-3H for linux-arm-kernel@lists.infradead.org; Mon, 11 Mar 2013 14:23:53 +0000 Received: from mail73-am1-R.bigfish.com (10.3.201.241) by AM1EHSOBE006.bigfish.com (10.3.204.26) with Microsoft SMTP Server id 14.1.225.23; Mon, 11 Mar 2013 14:23:49 +0000 Received: from mail73-am1 (localhost [127.0.0.1]) by mail73-am1-R.bigfish.com (Postfix) with ESMTP id 6759410015B; Mon, 11 Mar 2013 14:23:49 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: -1 X-BigFish: VS-1(zz936eIzz1f42h1ee6h1de0h1202h1e76h1d1ah1d2ahzz8275dhz2dh87h2a8h668h839h944hd25hf0ah1220h1288h12a5h12a9h12bdh137ah13b6h1441h1504h1537h153bh162dh1631h1758h18e1h1946h19b5h1ad9h1b0ah1155h) X-FB-DOMAIN-IP-MATCH: fail Received: from mail73-am1 (localhost.localdomain [127.0.0.1]) by mail73-am1 (MessageSwitch) id 1363011826581157_1702; Mon, 11 Mar 2013 14:23:46 +0000 (UTC) Received: from AM1EHSMHS017.bigfish.com (unknown [10.3.201.252]) by mail73-am1.bigfish.com (Postfix) with ESMTP id 80FFB240068; Mon, 11 Mar 2013 14:23:46 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by AM1EHSMHS017.bigfish.com (10.3.207.155) with Microsoft SMTP Server (TLS) id 14.1.225.23; Mon, 11 Mar 2013 14:23:42 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server (TLS) id 14.2.328.11; Mon, 11 Mar 2013 14:23:41 +0000 Received: from S2101-09.ap.freescale.net ([10.192.185.84]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id r2BENd8B024448; Mon, 11 Mar 2013 07:23:40 -0700 Date: Mon, 11 Mar 2013 22:24:05 +0800 From: Shawn Guo To: Subject: [GIT PULL] mxs fixes for 3.9, take 2 Message-ID: <20130311142402.GE25910@S2101-09.ap.freescale.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-OriginatorOrg: sigmatel.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130311_102352_344938_1C559DEC X-CRM114-Status: UNSURE ( 6.84 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [213.199.154.208 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org The following changes since commit 95381f38c0ed85be732553bf56f613ce701d411b: ARM: mxs: ocotp: Fix sparse warning (2013-03-04 10:07:28 +0800) are available in the git repository at: git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-fixes-3.9-2 for you to fetch changes up to 4a38a8502b0ea4ecbe86f60e0b2416771c51888d: ARM: mxs: cfa10049: Fix fb initialisation function (2013-03-07 10:54:23 +0800) ---------------------------------------------------------------- The 2nd mxs fixes for 3.9: - Fix an error caused by incorrect conflict resolution when applying the patch ---------------------------------------------------------------- Maxime Ripard (1): ARM: mxs: cfa10049: Fix fb initialisation function arch/arm/mach-mxs/mach-mxs.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)