From: Olof Johansson Subject: Re: [PATCH] ARM: dts: msm: Fix merge resolution Date: Tue, 18 Jun 2013 00:29:57 -0700 Message-ID: <20130618072957.GC21138@quad.lixom.net> References: <1371501578-24484-1-git-send-email-davidb@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mail-pb0-f42.google.com ([209.85.160.42]:55788 "EHLO mail-pb0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751603Ab3FRH3v (ORCPT ); Tue, 18 Jun 2013 03:29:51 -0400 Received: by mail-pb0-f42.google.com with SMTP id un1so3624319pbc.1 for ; Tue, 18 Jun 2013 00:29:51 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1371501578-24484-1-git-send-email-davidb@codeaurora.org> Sender: linux-arm-msm-owner@vger.kernel.org List-Id: linux-arm-msm@vger.kernel.org To: David Brown Cc: Russell King , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Stephen Boyd On Mon, Jun 17, 2013 at 01:39:38PM -0700, David Brown wrote: > Commit e45600107b (Merge tag 'msm-cleanup-for-3.11' of > git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into > next/cleanup) incorrectly resolved a merge conflict, resulting in a > node address that doesn't match the register address. > > Fix this node address. Luckily this is just cosmetic. Applied. -Olof