Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936903Ab3DIIje (ORCPT ); Tue, 9 Apr 2013 04:39:34 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:46103 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935660Ab3DIIja (ORCPT ); Tue, 9 Apr 2013 04:39:30 -0400 From: Roger Quadros To: CC: , , , , , , Roger Quadros Subject: Re: [PATCH 0/6] mfd: omap-usb-host: Device tree support for 3.10 Date: Tue, 9 Apr 2013 11:39:16 +0300 Message-ID: <1365496758-16287-1-git-send-email-rogerq@ti.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <20130409075457.GF24058@zurbaran> References: <20130409075457.GF24058@zurbaran> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 675 Lines: 23 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. cheers, -roger [*] commit 71f4b9cdfccfb82cff702fe61f4ace97a1dfb0e0 Author: Jingoo Han Date: Wed Feb 20 18:29:30 2013 +0900 mfd: omap-usb-host: Use devm_gpio_request_one() -- 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/