From patchwork Fri Mar 30 04:15:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 149534 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 71E46B6F9D for ; Fri, 30 Mar 2012 15:17:13 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SDTF1-0003U8-4r; Fri, 30 Mar 2012 04:15:11 +0000 Received: from mail-yx0-f177.google.com ([209.85.213.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SDTEy-0003Tu-AV for linux-arm-kernel@lists.infradead.org; Fri, 30 Mar 2012 04:15:08 +0000 Received: by yenm10 with SMTP id m10so101076yen.36 for ; Thu, 29 Mar 2012 21:15:06 -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 :x-gm-message-state:content-type; bh=Mqvjnqbb8CNmIJSHR5o61KI7k0W4t2c6QTpM+8uwosY=; b=NE5F7CmzS4LLzgOFZKxaq8DP2XCSY6ffdRnYoRCBQnWSmtM/p7xlSKzA/PGNGFsAMC Zrplw5fxa90tO+8F3MJKwDd8X90ydOy+qdVOwZ9szH2yD8oBhR1YDEv3+XO5J8iRdFa7 HGIrEaFxOSvqMRnaPrmtMjBzFajCjSzDqZSuUBugFEFHbAQLoG8F7pwn5ziMr+Unk1uL SYdOpydVRhYoE0A6SvM3ke3zoSCcyIqy6r+WFOYZD0BGL2YmqdQasMpzADzE4ZmHLaTy vH64L8gxPTzkng081eM+BpsNCn38YsACYYLtD3lDKQCz7NWA+cxSMyAO5rT1D322QBN/ zM+A== MIME-Version: 1.0 Received: by 10.236.200.228 with SMTP id z64mr628582yhn.10.1333080906725; Thu, 29 Mar 2012 21:15:06 -0700 (PDT) Received: by 10.147.154.14 with HTTP; Thu, 29 Mar 2012 21:15:06 -0700 (PDT) X-Originating-IP: [173.13.129.225] Date: Thu, 29 Mar 2012 21:15:06 -0700 Message-ID: Subject: [GIT PULL] ARM: arm-soc fixes for 3.4-rc From: Olof Johansson To: Linus Torvalds X-Gm-Message-State: ALoCoQm6oYCXKDY3ShjyyXxYqQlpZnIWTqbfdtadHU9kNMM4kWs5DKtxGKj+257MmFPwY1FBpdL7 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.213.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: , 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 Linus, The following changes since commit b5174fa3a7f4f8f150bfa3b917c92608953dfa0f: Merge tag 'mmc-merge-for-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc (2012-03-28 20:59:45 -0700) 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 f00e9b11863abdb837e555a2b1e3417e8b5d80dd: Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes (2012-03-29 20:36:18 -0700) ---------------------------------------------------------------- ARM: arm-soc fixes for 3.4-rc This is a first pass of some of the merge window fallout for ARM platforms. Nothing controversial: * A system.h fallout fix for OMAP * PXA fixes for breakage caused by the regulator struct changes * GPIO fixes for OMAP to properly deal with dynamic IRQ allocation * A mismerge in our arm-soc tree of an lpc32xx change for networking * A fix for USB setup on tegra * An undo of __init annotation of display mux setup on OMAP that's needed at runtime ---------------------------------------------------------------- Govindraj.R (1): ARM: OMAP: pm: fix compilation break Haojian Zhuang (2): ARM: pxa: fix build issue on cm-x300 ARM: pxa: fix build issue on stargate2 Olof Johansson (3): Merge branch 'for-3.4/fixes-for-rc1-and-v3.3' of git://git.kernel.org/.../swarren/linux-tegra into fixes Merge branch 'fixes' of git://git.kernel.org/.../tmlind/linux-omap into fixes Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes Paul Gortmaker (2): ARM: pxa: fix regulator related build fail in magician_defconfig ARM: pxa: fix build failure for regulator consumer in em-x270.c Roland Stigge (1): ARM: LPC32xx: clock.c: Fix lpc-eth clock reference Stephen Warren (1): ARM: tegra: Fix device tree AUXDATA for USB/EHCI Tarun Kanti DebBarma (3): ARM: OMAP: boards: Fix OMAP_GPIO_IRQ usage with gpio_to_irq() drivers: input: Fix OMAP_GPIO_IRQ with gpio_to_irq() in ams_delta_serio_exit() ARM: OMAP: Remove OMAP_GPIO_IRQ macro definition Tomi Valkeinen (1): ARM: OMAP2+: Remove __init from DSI mux functions Tony Lindgren (2): Merge branch 'fix-dss-mux' into fixes Merge branch 'fixes-gpio-to-irq' into fixes arch/arm/mach-lpc32xx/clock.c | 2 +- arch/arm/mach-omap1/board-h2.c | 8 ++++---- arch/arm/mach-omap1/board-h3.c | 9 ++++----- arch/arm/mach-omap1/board-htcherald.c | 6 +++--- arch/arm/mach-omap1/board-innovator.c | 4 ++-- arch/arm/mach-omap1/board-nokia770.c | 2 +- arch/arm/mach-omap1/board-osk.c | 12 ++++++------ arch/arm/mach-omap1/board-palmte.c | 2 +- arch/arm/mach-omap1/board-palmtt.c | 2 +- arch/arm/mach-omap1/board-palmz71.c | 2 +- arch/arm/mach-omap1/board-voiceblue.c | 16 +++++++--------- arch/arm/mach-omap1/pm.c | 1 + arch/arm/mach-omap2/board-2430sdp.c | 2 +- arch/arm/mach-omap2/board-4430sdp.c | 2 +- arch/arm/mach-omap2/board-apollon.c | 4 ++-- arch/arm/mach-omap2/board-devkit8000.c | 2 +- arch/arm/mach-omap2/board-h4.c | 2 +- arch/arm/mach-omap2/board-omap3evm.c | 2 +- arch/arm/mach-omap2/board-omap4panda.c | 2 +- arch/arm/mach-omap2/board-rx51-peripherals.c | 3 ++- arch/arm/mach-omap2/board-zoom-debugboard.c | 3 ++- arch/arm/mach-omap2/board-zoom-peripherals.c | 6 ++++-- arch/arm/mach-omap2/common-board-devices.c | 2 +- arch/arm/mach-omap2/display.c | 8 ++++---- arch/arm/mach-omap2/pm.c | 2 ++ arch/arm/mach-pxa/cm-x300.c | 1 - arch/arm/mach-pxa/em-x270.c | 10 +++++----- arch/arm/mach-pxa/hx4700.c | 2 -- arch/arm/mach-pxa/magician.c | 2 -- arch/arm/mach-pxa/stargate2.c | 2 +- arch/arm/mach-tegra/board-dt-tegra20.c | 6 +++--- arch/arm/mach-tegra/devices.c | 7 +++---- arch/arm/mach-tegra/devices.h | 5 +++++ arch/arm/plat-omap/include/plat/gpio.h | 4 ---- drivers/input/serio/ams_delta_serio.c | 2 +- 35 files changed, 73 insertions(+), 74 deletions(-)