From patchwork Fri Nov 11 15:57:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 125195 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 DFA6B1007D4 for ; Sat, 12 Nov 2011 03:00:14 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1ROtU7-0000N9-6f; Fri, 11 Nov 2011 15:57:43 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1ROtTv-0000L9-Ux for linux-arm-kernel@merlin.infradead.org; Fri, 11 Nov 2011 15:57:32 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by casper.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1ROtTt-0006fT-8I for linux-arm-kernel@lists.infradead.org; Fri, 11 Nov 2011 15:57:30 +0000 Received: from dude.hi.pengutronix.de ([2001:6f8:1178:2:21e:67ff:fe11:9c5c]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1ROtTl-0000yY-TH; Fri, 11 Nov 2011 16:57:21 +0100 Received: from sha by dude.hi.pengutronix.de with local (Exim 4.77) (envelope-from ) id 1ROtTl-0001o2-4t; Fri, 11 Nov 2011 16:57:21 +0100 Date: Fri, 11 Nov 2011 16:57:21 +0100 From: Sascha Hauer To: Arnd Bergmann Subject: [GIT PULL] i.MX fixes Message-ID: <20111111155721.GB16886@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 16:55:22 up 22 days, 22:30, 64 users, load average: 3.25, 3.47, 3.84 User-Agent: Mutt/1.5.21 (2010-09-15) X-SA-Exim-Connect-IP: 2001:6f8:1178:2:21e:67ff:fe11:9c5c X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20111111_155729_593747_B76FFF23 X-CRM114-Status: GOOD ( 25.15 ) X-Spam-Score: -3.1 (---) X-Spam-Report: SpamAssassin version 3.3.2 on casper.infradead.org summary: Content analysis details: (-3.1 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.2 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Olof Johansson , 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 Arnd, Olof, Please pull the following. I don't know exactly when Arnd is back again, so I have Olof still on Cc. Sascha The following changes since commit 1ea6b8f48918282bdca0b32a34095504ee65bab5: Linux 3.2-rc1 (2011-11-07 16:16:02 -0800) are available in the git repository at: git://git.pengutronix.de/git/imx/linux-2.6.git imx-fixes-for-arnd Richard Zhao (1): ARM: mx51/53: set pwm clock parent to ipg_perclk Shawn Guo (3): arm/imx: fix the references to ARCH_MX3 arm/imx: fix AUTO_ZRELADDR selection arm/imx: fix imx6q mmc error when mounting rootfs arch/arm/mach-imx/Makefile.boot | 34 +++++++++++++++++++--------------- arch/arm/mach-imx/clock-imx6q.c | 17 ++++++++++++++++- arch/arm/mach-mx5/clock-mx51-mx53.c | 4 ++-- arch/arm/plat-mxc/Kconfig | 4 ++-- drivers/mmc/host/sdhci-esdhc-imx.c | 8 ++++++++ 5 files changed, 47 insertions(+), 20 deletions(-)