From patchwork Tue Nov 22 10:40:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 127060 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 41A7AB6F64 for ; Tue, 22 Nov 2011 21:43:45 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RSnmg-0003oM-FF; Tue, 22 Nov 2011 10:41:02 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RSnmc-0003nx-BB for linux-arm-kernel@merlin.infradead.org; Tue, 22 Nov 2011 10:40:58 +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 1RSnmV-0007s3-OL for linux-arm-kernel@lists.infradead.org; Tue, 22 Nov 2011 10:40:57 +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 1RSnmP-00061o-6Q; Tue, 22 Nov 2011 11:40:45 +0100 Received: from sha by dude.hi.pengutronix.de with local (Exim 4.77) (envelope-from ) id 1RSnmN-0006wC-UK; Tue, 22 Nov 2011 11:40:43 +0100 Date: Tue, 22 Nov 2011 11:40:43 +0100 From: Sascha Hauer To: Arnd Bergmann Subject: [GIT PULL] i.MXf fixes/cleanups Message-ID: <20111122104043.GG27267@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: 11:38:37 up 9 days, 18:25, 42 users, load average: 1.20, 2.77, 3.31 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-20111122_104052_097246_8D1AA78C X-CRM114-Status: GOOD ( 26.56 ) 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 , Shawn Guo , 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 for -rc. It contains build fixes and also some cleanups. Sascha The following changes since commit cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37: Linux 3.2-rc2 (2011-11-15 15:02:59 -0200) are available in the git repository at: git://git.pengutronix.de/git/imx/linux-2.6.git imx-for-arnd Arnd Bergmann (1): ARM: imx: export imx_ioremap Fabio Estevam (2): ARM: imx: Remove unused chip revision strings ARM: mx5: Fix checkpatch warnings in cpu-imx5.c Paul Bolle (1): ARM: imx: drop 'ARCH_MX31' and 'ARCH_MX35' Sascha Hauer (4): MAINTAINERS: Add missing directory Merge branches 'fixes/imx3-build', 'fixes/imx_ioremap' and 'fixes/maintainer-update' into imx-fixes Merge branch 'cleanups/assorted' into imx-fixes-for-arnd Merge branch 'cleanups/remove-unused-kconfig' into imx-fixes-for-arnd Shawn Guo (1): arm/imx: remove imx_idle hook and use pm_idle instead Uwe Kleine-König (1): ARM: imx/mm-imx3: conditionally compile i.MX31 and i.MX35 code MAINTAINERS | 1 + arch/arm/mach-imx/Kconfig | 13 ---- arch/arm/mach-imx/mm-imx3.c | 109 ++++++++++++++++-------------- arch/arm/mach-mx5/cpu.c | 5 +- arch/arm/mach-mx5/mm.c | 6 +- arch/arm/plat-mxc/include/mach/common.h | 1 - arch/arm/plat-mxc/include/mach/mxc.h | 14 ---- arch/arm/plat-mxc/include/mach/system.h | 7 +-- arch/arm/plat-mxc/system.c | 3 +- 9 files changed, 69 insertions(+), 90 deletions(-)