Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754608Ab3JYNFx (ORCPT ); Fri, 25 Oct 2013 09:05:53 -0400 Received: from mail-ee0-f50.google.com ([74.125.83.50]:46864 "EHLO mail-ee0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753084Ab3JYNDv (ORCPT ); Fri, 25 Oct 2013 09:03:51 -0400 From: Thierry Reding To: Steffen Trumtrar , Mark Brown , Liam Girdwood , Lee Jones Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: linux-next: manual merge of the mfd-lj tree Date: Fri, 25 Oct 2013 15:03:41 +0200 Message-Id: <1382706224-8859-3-git-send-email-treding@nvidia.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1382706224-8859-1-git-send-email-treding@nvidia.com> References: <1382632289-18523-1-git-send-email-treding@nvidia.com> <1382706224-8859-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: 634 Lines: 18 Today's linux-next merge of the mfd-lj tree got conflicts in sound/soc/codecs/mc13783.c caused by commits 9f6f0af (ASoC: mc13783: add spi errata fix), fd792f8 (mfd: mc13xxx: Move SPI erratum workaround into SPI I/O function) and 2d9215c (ASoC: mc13783: Use regmap directly from ASoC). I fixed it up and the diff turned up empty, so I think it can't be all that wrong. Thanks, Thierry -- 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/