From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752907Ab1KGTIJ (ORCPT ); Mon, 7 Nov 2011 14:08:09 -0500 Received: from moutng.kundenserver.de ([212.227.126.171]:56979 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752764Ab1KGTIH (ORCPT ); Mon, 7 Nov 2011 14:08:07 -0500 From: Arnd Bergmann To: Stephen Rothwell Subject: Re: linux-next: manual merge of the arm-soc tree with Linus' tree Date: Mon, 7 Nov 2011 20:07:40 +0100 User-Agent: KMail/1.12.2 (Linux/2.6.35-22-generic; KDE/4.3.2; x86_64; ; ) Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org References: <20111107103313.6e1067675b2cd2f2de6bded7@canb.auug.org.au> In-Reply-To: <20111107103313.6e1067675b2cd2f2de6bded7@canb.auug.org.au> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Message-Id: <201111072007.41353.arnd@arndb.de> X-Provags-ID: V02:K0:hzLXEcfFJK9twQRZKd7ksI2m8xb0GF7VilPidOfeaNj mP6On00BS1Obhn00p0XFstwEKgedFpMR9p5VoC3OTs6zKfa3si h7r7Pg87eaoZaqn++kND9b7PV7dBI04vlhYLRP0HS+WtxMTPN0 lHIJK8KqYRV+bJl/tc+DGYs6wS2WDdEaPd7GaaWDwGZOOQHUBE Mxy2kLGDNEV9h0E/jaFE3jfN7QzQzP+IMt77TgfDfu+6fTMX8i naj6OIV55D44KWGstL+ITqZfO6lGdRU7rkNpPCyVQ3Xt2rrRP6 +RplZxHLyGUwIxrTCK9hFkqd4E7ehwra1FmRxEIiQpKWVAMqCF 8DZwcYQxj0tLA1AO4FrU= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Monday 07 November 2011, Stephen Rothwell wrote: > I just used the version from Linus' tree. Arnd, it seems that some of > these merges were done differently by Linus, so can you please clean up > the arm-soc tree now that it looks like Linus may have merged all its > content. Ok, done. Thanks for the info! Arnd