Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753483Ab3JVPLd (ORCPT ); Tue, 22 Oct 2013 11:11:33 -0400 Received: from mail-bk0-f52.google.com ([209.85.214.52]:60335 "EHLO mail-bk0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752978Ab3JVPLN (ORCPT ); Tue, 22 Oct 2013 11:11:13 -0400 From: Thierry Reding To: Kishon Vijay Abraham I , Greg Kroah-Hartman , Srinivas Pandruvada , "Rafael J. Wysocki" Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: linux-next: manual merge of the usb tree Date: Tue, 22 Oct 2013 17:08:37 +0200 Message-Id: <1382454517-4074-4-git-send-email-treding@nvidia.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1382454517-4074-1-git-send-email-treding@nvidia.com> References: <1382454517-4074-1-git-send-email-treding@nvidia.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 827 Lines: 30 Today's linux-next merge of the usb tree got a conflict in drivers/Kconfig caused by commits ff76496 (drivers: phy: add generic PHY framework) and 12cc4b38 (PowerCap: Add to drivers Kconfig and Makefile). I fixed it up (see below). Please verify that the resolution look good. Thanks, Thierry --- diff --cc drivers/Kconfig index 969e987,8f45144..97536a2 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@@ -166,6 -166,6 +166,8 @@@ source "drivers/reset/Kconfig source "drivers/fmc/Kconfig" +source "drivers/powercap/Kconfig" + + source "drivers/phy/Kconfig" + endmenu -- 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/