From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755634Ab2KZTcY (ORCPT <rfc822;w@1wt.eu>);
	Mon, 26 Nov 2012 14:32:24 -0500
Received: from mail.kernel.org ([198.145.19.201]:58606 "EHLO mail.kernel.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1755564Ab2KZTcX (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Mon, 26 Nov 2012 14:32:23 -0500
Date: Mon, 26 Nov 2012 11:32:21 -0800
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org, Bill Pemberton <wfp5p@virginia.edu>,
        Bo Shen <voice.shen@atmel.com>,
        Mark Brown <broonie@opensource.wolfsonmicro.com>,
        Liam Girdwood <lrg@ti.com>
Subject: Re: linux-next: manual merge of the char-misc tree with the
 sound-asoc tree
Message-ID: <20121126193221.GB3413@kroah.com>
References: <20121126194229.feef81574cac8e860cf68df9@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20121126194229.feef81574cac8e860cf68df9@canb.auug.org.au>
User-Agent: Mutt/1.5.21 (2010-09-15)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, Nov 26, 2012 at 07:42:29PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in
> drivers/misc/atmel-ssc.c between commit 5c86ac695c7e ("ASoC: atmel-ssc:
> use module_platform_driver macro") from the sound-asoc tree and commit
> 2d6bed9ca93e ("drivers/misc: remove use of __devexit_p") from the
> char-misc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good to me, thanks.

greg k-h