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 S1755378Ab2DXOpV (ORCPT <rfc822;w@1wt.eu>);
	Tue, 24 Apr 2012 10:45:21 -0400
Received: from out3-smtp.messagingengine.com ([66.111.4.27]:33805 "EHLO
	out3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1754588Ab2DXOpR (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Tue, 24 Apr 2012 10:45:17 -0400
X-Sasl-enc: X4qa+zgyDqP+OtvRmXKXMwg26HzUr9eO2qU84izfXE1n 1335278716
Date: Tue, 24 Apr 2012 07:45:14 -0700
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        MyungJoo Ham <myungjoo.ham@samsung.com>,
        Kyungmin Park <kyungmin.park@samsung.com>,
        John Stultz <john.stultz@linaro.org>
Subject: Re: linux-next: manual merge of the staging tree with the
 driver-core tree
Message-ID: <20120424144514.GC3532@kroah.com>
References: <20120424144837.67a84b1e4e5905de7fd03e67@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20120424144837.67a84b1e4e5905de7fd03e67@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 Tue, Apr 24, 2012 at 02:48:37PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got conflicts in
> drivers/staging/android/Kconfig and drivers/staging/android/Makefile
> between commit 449a2bf5e881 ("Remove "switch" class in
> drivers/staging/android/switch") from the driver-core tree and commit
> ef2353d26bdc ("android-alarm: Remove unused android alarm in-kernel
> interfaces") from the staging tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Thanks, that looks fine.

greg k-h