Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935583Ab3DIJAj (ORCPT ); Tue, 9 Apr 2013 05:00:39 -0400 Received: from mga03.intel.com ([143.182.124.21]:9710 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934875Ab3DIJAc (ORCPT ); Tue, 9 Apr 2013 05:00:32 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,437,1363158000"; d="scan'208";a="283562200" Date: Tue, 9 Apr 2013 11:00:27 +0200 From: Samuel Ortiz To: Roger Quadros Cc: balbi@ti.com, mark.rutland@arm.com, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, linux-omap@vger.kernel.org, devicetree-discuss@lists.ozlabs.org Subject: Re: [PATCH 0/6] mfd: omap-usb-host: Device tree support for 3.10 Message-ID: <20130409090027.GE23447@zurbaran> References: <20130409075457.GF24058@zurbaran> <1365496758-16287-1-git-send-email-rogerq@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1365496758-16287-1-git-send-email-rogerq@ti.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 665 Lines: 21 On Tue, Apr 09, 2013 at 11:39:16AM +0300, Roger Quadros wrote: > Samuel, > > You had the conflicts because a patch [*] was introduced and is not > required since the reset logic is being removed from the driver. > > Anyways, I've rebased the 2 patches on top of mfd-next, so now it > shouldn't matter. Both patches applied, thanks a lot. Cheers, Samuel. -- Intel Open Source Technology Centre http://oss.intel.com/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/