From patchwork Mon Aug 20 05:55:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 178663 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 795E72C0085 for ; Mon, 20 Aug 2012 15:58:17 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T3KxW-0007hF-FP; Mon, 20 Aug 2012 05:55:30 +0000 Received: from mail-vb0-f49.google.com ([209.85.212.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1T3KxS-0007h1-Mu for linux-arm-kernel@lists.infradead.org; Mon, 20 Aug 2012 05:55:27 +0000 Received: by vbbfo1 with SMTP id fo1so5359919vbb.36 for ; Sun, 19 Aug 2012 22:55:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=iC3kq0aMah5nzlQvii9oWgzprQ48+5TkwOqgy6/4STw=; b=e97T49mtNpFIonUdNEiK8EVuEBGijgaqkC1z4A7EMCvA/VJB3AtsjLTwQzS4QBbhGY v8Am4Y1vgnLBByQPIfpGRaSCV2tA+d4vsqPPF4sZOgooC1zbkVBpY+qe65+FKQCJlJBv vcmmfL6UMASPu1BFA5QaNI5yPWvsrxngdWIPhUvX2VwsUSBJok2/uKSLpY3v6RopSPQ7 js7shnOjCdZodKeyDvqae8ZUecQSOaHNVarhglm+NPpLla/zMTfj2Mt8KMIE6BSevm3J FMfw22FSRffg7zG9H+Bm3Bng7YYky1/ToGCXhYpFWWMbsaW8P7Bg3Ny8R5S3CcE6D5CS UNtQ== MIME-Version: 1.0 Received: by 10.58.189.69 with SMTP id gg5mr9899716vec.6.1345442123845; Sun, 19 Aug 2012 22:55:23 -0700 (PDT) Received: by 10.52.159.65 with HTTP; Sun, 19 Aug 2012 22:55:23 -0700 (PDT) Date: Mon, 20 Aug 2012 13:55:23 +0800 Message-ID: Subject: [GIT PULL][for 3.7] pull request for pxa/dt branch in arm-soc from arch-pxa git tree From: Haojian Zhuang To: Bergmann Arnd , Olof Johansson , linux-arm-kernel@lists.infradead.org X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (haojian.zhuang[at]gmail.com) -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.212.49 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 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 Hi Arnd & Olof, Please help to merge these three patches into pxa/dt branch. Since they're depend on existing patch on pxa/dt branch, I didn't do rebase on v3.6-rc2. Regards Haojian The following changes since commit 51931b37fcb17a2f48f726fd21b88e3af770ddc2: ARM: mmp: enable tauros2 cache in mmp2 dt (2012-08-16 16:17:10 +0800) are available in the git repository at: git://github.com/hzhuang1/linux.git dt for you to fetch changes up to e6c509c8ef85155bf504254399d758384a3b2e38: ARM: pxa: fix build issue while CONFIG_OF is disabled (2012-08-20 13:52:05 +0800) ---------------------------------------------------------------- Haojian Zhuang (3): ARM: pxa: append the definition of CKENC mtd: nand: append missing parameter and value ARM: pxa: fix build issue while CONFIG_OF is disabled arch/arm/mach-pxa/include/mach/pxa3xx-regs.h | 1 + arch/arm/mach-pxa/pxa3xx.c | 2 ++ drivers/mtd/nand/pxa3xx_nand.c | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-)