| Message ID | CAOesGMiBPVtYwMN2o-e_vBC_XOdgjuDfrBs-ftAByvfdCsrB3w@mail.gmail.com |
|---|---|
| State | New |
| Headers | show
Return-Path: <linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org> X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (unknown [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 BFDA82C0091 for <incoming-imx@patchwork.ozlabs.org>; Fri, 3 Aug 2012 03:48:19 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SwzSU-0001FM-NR; Thu, 02 Aug 2012 17:45:14 +0000 Received: from mail-gg0-f177.google.com ([209.85.161.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SwzSR-0001Dw-W3 for linux-arm-kernel@lists.infradead.org; Thu, 02 Aug 2012 17:45:12 +0000 Received: by mail-gg0-f177.google.com with SMTP id s5so9360944ggc.36 for <linux-arm-kernel@lists.infradead.org>; Thu, 02 Aug 2012 10:45:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-originating-ip:date:message-id:subject:from:to:cc :content-type:x-gm-message-state; bh=h8DDyacuFFcv+O4TTdqyekeoS059FjIjbDWk2FQCvHM=; b=nqbXmdmQyiCU0sNUhXJ6X7HHDUPOZMaLtp6I0peo5wi77VAabSB0omxy9v3MRSQNUx E+3xhX2a4hv6x3By7E11Z50jVeIa1qakN/mtLXiP+A3fAG1Un8yAas/uMvLiRSlzIK0Q a/nYdbziknxDQtc2l7/kDtrvEqWgNAZQXcyP2UF4HU9tVAc3qn3hufRuMeA4oT/wI/FV zeY9S0lgaZQrm41cAEq7184mFYzeEddBZHLYAHNCY+QBuFMMWjyJQW6lrh8RLYOb5vhi QE7BBgpgfGQjWsvOvNCyUdDAWvoIlUBN8efn2V3AysOcC2DHX8xtCqVxfKuzN6WgR3ut 23zw== MIME-Version: 1.0 Received: by 10.66.75.97 with SMTP id b1mr43716084paw.15.1343929511548; Thu, 02 Aug 2012 10:45:11 -0700 (PDT) Received: by 10.142.131.5 with HTTP; Thu, 2 Aug 2012 10:45:11 -0700 (PDT) X-Originating-IP: [2620:0:1000:1b02:1aa9:5ff:fe24:37a9] Date: Thu, 2 Aug 2012 10:45:11 -0700 Message-ID: <CAOesGMiBPVtYwMN2o-e_vBC_XOdgjuDfrBs-ftAByvfdCsrB3w@mail.gmail.com> Subject: [GIT PULL 1/3] ARM: SoC fixes From: Olof Johansson <olof@lixom.net> To: Linus Torvalds <torvalds@linux-foundation.org> X-Gm-Message-State: ALoCoQkmQ8rgHC4G9mqeBzGwp8Z/8ifGfJDgmeuAfdOETSqxHJ9mTv58pzHB+5K7vy5dQV5Cg+XY X-Spam-Note: CRM114 invocation failed 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 [209.85.161.177 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: arm@kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 |
A few fixes for merge window fallout, and a bugfix for timer resume on PRIMA2. ---------------------------------------------------------------- The following changes since commit 1a9b4993b70fb1884716902774dc9025b457760d: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/fixes-for-linus for you to fetch changes up to bac6f61550043195ee59e9cef0db67af23baf11e: ARM: mmp: add missing irqs.h ---------------------------------------------------------------- Barry Song (1): ARM: PRIMA2: delete redundant codes to restore LATCHED when timer resumes Fabio Estevam (1): ARM: mxc: Include missing irqs.h header Haojian Zhuang (1): ARM: mmp: add missing irqs.h Thomas Petazzoni (1): arm: mvebu: fix typo in .dtsi comment for Armada XP SoCs arch/arm/boot/dts/armada-xp.dtsi | 2 +- arch/arm/mach-mmp/gplugd.c | 1 + arch/arm/mach-prima2/timer.c | 6 +++--- arch/arm/plat-mxc/tzic.c | 1 + 4 files changed, 6 insertions(+), 4 deletions(-)