Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932081Ab3GAXA0 (ORCPT ); Mon, 1 Jul 2013 19:00:26 -0400 Received: from mga14.intel.com ([143.182.124.37]:32485 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755100Ab3GAXAZ (ORCPT ); Mon, 1 Jul 2013 19:00:25 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,976,1363158000"; d="scan'208";a="358989094" Date: Tue, 2 Jul 2013 00:55:17 +0200 From: Samuel Ortiz To: Mark Brown Cc: Lee Jones , patches@opensource.wolfsonmicro.com, linux-kernel@vger.kernel.org, Mark Brown Subject: Re: [PATCH] mfd: wm8994: Remove duplicate check for active JACKDET Message-ID: <20130701225517.GC4572@zurbaran> References: <1372708578-9377-1-git-send-email-broonie@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1372708578-9377-1-git-send-email-broonie@kernel.org> 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: 715 Lines: 25 Hi Mark, On Mon, Jul 01, 2013 at 08:56:18PM +0100, Mark Brown wrote: > From: Mark Brown > > Probably the result of a mismerge or rebase failing to notice that the > hunk had already been applied. > > Signed-off-by: Mark Brown > --- > drivers/mfd/wm8994-core.c | 14 -------------- > 1 file changed, 14 deletions(-) Applied to mfd-next, thanks. 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/