From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754079Ab0LMTcL (ORCPT ); Mon, 13 Dec 2010 14:32:11 -0500 Received: from mho-02-ewr.mailhop.org ([204.13.248.72]:47996 "EHLO mho-02-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753734Ab0LMTcJ (ORCPT ); Mon, 13 Dec 2010 14:32:09 -0500 X-Mail-Handler: MailHop Outbound by DynDNS X-Originating-IP: 24.130.172.179 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/mailhop/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1+Gu5zWrF82KXL8qN+/kO7B Date: Mon, 13 Dec 2010 11:32:05 -0800 From: Tony Lindgren To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org Subject: [GIT PULL] omap fixes for v2.6.37-rc5 Message-ID: <20101213193204.GY3054@atomide.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, Please pull what should be the last set of omap specific fixes for this -rc cycle: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git omap-fixes-for-linus The main fixes are to make PM code to compile without CONFIG_DEBUG_FS, and a fix for the console for suspend. The first patch just moves some code around. The second patch adds checks for suspend to the recent fix 0d8e2d0dad98a693bad88aea6876ac8b94ad95c6 (OMAP2+: PM/serial: hold console semaphore while OMAP UARTs are disabled). Again, this will eventually be handled by runtime PM but that's not suitable for the -rc series. The rest are trivial fixes for for some board specific issues, and to handle clk_get values with IS_ERR. Regards, Tony The following changes since commit cf7d7e5a1980d1116ee152d25dac382b112b9c17: Linux 2.6.37-rc5 (2010-12-06 20:09:04 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git omap-fixes-for-linus Aaro Koskinen (1): arm: omap2: io: fix clk_get() error check Kevin Hilman (3): omap: PM debug: fix wake-on-timer debugfs dependency OMAP1: SRAM: fix size for OMAP1611 SoCs OMAP2+: PM/serial: fix console semaphore acquire during suspend Ohad Ben-Cohen (1): omap: zoom: wl1271 slot is MMC_CAP_POWER_OFF_CARD Paul Walmsley (1): OMAP2: PRCM: fix some SHIFT macros that were actually bitmasks Sukumar Ghorai (1): omap: nand: remove hardware ECC as default Vasiliy Kulikov (1): arm: plat-omap: counter_32k: use IS_ERR() instead of NULL check arch/arm/mach-omap2/board-zoom-peripherals.c | 2 +- arch/arm/mach-omap2/io.c | 2 +- arch/arm/mach-omap2/pm-debug.c | 34 +++++++++++++------------- arch/arm/mach-omap2/pm24xx.c | 34 +++++++++++++++++++++++-- arch/arm/mach-omap2/pm34xx.c | 27 +++++++++++++++----- arch/arm/mach-omap2/prcm-common.h | 11 ++++---- arch/arm/plat-omap/counter_32k.c | 3 +- arch/arm/plat-omap/sram.c | 2 +- drivers/mtd/nand/omap2.c | 1 - 9 files changed, 79 insertions(+), 37 deletions(-)