| Submitter | Tony Lindgren |
|---|---|
| Date | Aug. 12, 2011, 8:10 a.m. |
| Message ID | <20110812081056.GP1939@atomide.com> |
| Download | mbox |
| Permalink | /patch/109788/ |
| 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 (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 8F4B1B6F72 for <incoming-imx@patchwork.ozlabs.org>; Fri, 12 Aug 2011 18:11:15 +1000 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qrmpb-0003g1-PS; Fri, 12 Aug 2011 08:11:04 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Qrmpb-0003ZP-A6; Fri, 12 Aug 2011 08:11:03 +0000 Received: from mho-03-ewr.mailhop.org ([204.13.248.66] helo=mho-01-ewr.mailhop.org) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QrmpY-0003Z6-Na for linux-arm-kernel@lists.infradead.org; Fri, 12 Aug 2011 08:11:01 +0000 Received: from c-98-234-237-12.hsd1.ca.comcast.net ([98.234.237.12] helo=localhost.localdomain) by mho-01-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from <tony@atomide.com>) id 1QrmpX-0006gY-5i; Fri, 12 Aug 2011 08:10:59 +0000 Received: from Mutt by mutt-smtp-wrapper.pl 1.2 (www.zdo.com/articles/mutt-smtp-wrapper.shtml) X-Mail-Handler: MailHop Outbound by DynDNS X-Originating-IP: 98.234.237.12 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/mailhop/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX19OhrN8rHvwcnUrtadL71a0 Date: Fri, 12 Aug 2011 01:10:57 -0700 From: Tony Lindgren <tony@atomide.com> To: Arnd Bergmann <arnd@arndb.de> Subject: [GIT PULL] omap fixes for v3.1-rc1 Message-ID: <20110812081056.GP1939@atomide.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110812_041100_830209_059000F7 X-CRM114-Status: GOOD ( 12.01 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [204.13.248.66 listed in list.dnswl.org] 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 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="utf-8" Content-Transfer-Encoding: base64 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, Please pull omap fixes for -rc1 from: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git fixes Note that this also includes a trivial patch that adds the missing UART4 defines used on some boards that would be good to get merged. If you rather have that in a separate branch I can do that too. Regards, Tony The following changes since commit 322a8b034003c0d46d39af85bf24fee27b902f48: Linus Torvalds (1): Linux 3.1-rc1 are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git fixes Colin Cross (1): OMAP2+: PM: SmartReflex: use put_sync_suspend for IRQ-safe disabling Hemant Pedanekar (1): omap: timer: Set dmtimer used as clocksource in autoreload mode Johan Hovold (1): OMAP3: am3517crane: remove NULL board_mux from board file Kevin Hilman (3): OMAP2+: Kconfig: don't select PM in OMAP2PLUS_TYPICAL OMAP1: enable GENERIC_IRQ_CHIP OMAP3: beagle: don't touch omap_device internals Maxin John (1): arch:arm:plat-omap:iovmm: remove unused variable 'va' Nishanth Menon (1): OMAP3+: SR: ensure pm-runtime callbacks can be invoked with IRQs disabled Oleg Drokin (1): Update Nook Color machine 3284 to common Encore name Paul Walmsley (1): OMAP: hwmod: fix build break on non-OMAP4 multi-OMAP2 builds Peter Ujfalusi (1): OMAP: Fix linking error in twl-common.c for OMAP2/3/4 only builds Raphaël Assénat (1): am3505/3517: Various platform defines for UART4 Thomas Meyer (1): arm: mach-omap2: mux: use kstrdup() Tony Lindgren (1): Merge branch 'for_3.1/pm-fixes' of git://git.kernel.org/.../khilman/linux-omap-pm into fixes arch/arm/mach-omap2/Kconfig | 1 - arch/arm/mach-omap2/board-am3517crane.c | 2 - arch/arm/mach-omap2/board-omap3beagle.c | 23 ++++----- arch/arm/mach-omap2/cminst44xx.h | 25 +++++++++- arch/arm/mach-omap2/mux.c | 14 ++---- arch/arm/mach-omap2/smartreflex.c | 3 +- arch/arm/mach-omap2/timer.c | 3 +- arch/arm/mach-omap2/twl-common.c | 78 ++++++++++++++++-------------- arch/arm/plat-omap/Kconfig | 1 + arch/arm/plat-omap/include/plat/dma.h | 5 ++ arch/arm/plat-omap/include/plat/irqs.h | 1 + arch/arm/plat-omap/include/plat/serial.h | 3 + arch/arm/plat-omap/iovmm.c | 3 - arch/arm/tools/mach-types | 2 +- 14 files changed, 94 insertions(+), 70 deletions(-)