Message ID | 037401ccc8e7$e5671380$b0353a80$%kim@samsung.com |
---|---|
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 06084B6F9A for <incoming-imx@patchwork.ozlabs.org>; Mon, 2 Jan 2012 11:49:10 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RhW2W-0000bj-Tg; Mon, 02 Jan 2012 00:46:13 +0000 Received: from mailout4.samsung.com ([203.254.224.34]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RhW2S-0000bV-6i for linux-arm-kernel@lists.infradead.org; Mon, 02 Jan 2012 00:46:10 +0000 Received: from epcpsbgm2.samsung.com (mailout4.samsung.com [203.254.224.34]) by mailout4.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTP id <0LX5001T7BGEZM50@mailout4.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 02 Jan 2012 09:46:01 +0900 (KST) X-AuditID: cbfee61b-b7b95ae00000198b-5d-4f00fe49c0e5 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (MMPCPMTA) with SMTP id D3.09.06539.94EF00F4; Mon, 02 Jan 2012 09:46:01 +0900 (KST) Received: from DOKGENEKIM03 ([12.23.120.114]) by mmp1.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTPA id <0LX500GVQBGN2R70@mmp1.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 02 Jan 2012 09:46:01 +0900 (KST) From: Kukjin Kim <kgene.kim@samsung.com> To: 'Arnd Bergmann' <arnd@arndb.de>, 'Olof Johansson' <olof@lixom.net> Subject: [GIT PULL] Samsung devel-dma for v3.3 Date: Mon, 02 Jan 2012 09:45:59 +0900 Message-id: <037401ccc8e7$e5671380$b0353a80$%kim@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Content-language: ko Thread-index: AczI5+UuxWk/JSvRTEahYgSk2qLRXg== X-Brightmail-Tracker: AAAAAA== X-Spam-Note: CRM114 invocation failed X-Spam-Score: -5.8 (-----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-5.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [203.254.224.34 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.6 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: "'Koul, Vinod'" <vinod.koul@intel.com>, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, boojin.kim@samsung.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 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="us-ascii" Content-Transfer-Encoding: 7bit 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 |
On Tue, Jan 03, 2012 at 09:11:59PM +0000, Arnd Bergmann wrote: > There were some conflicts between imx changes that went into the dma-slave > tree and those that went into arm-soc. Sascha, Shawn: can you have a look > to make sure the resolution below is correct? The resolution looks correct to me.