From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: Re: linux-next: manual merge of the arm-soc tree with Linus' tree Date: Mon, 7 Nov 2011 20:07:40 +0100 Message-ID: <201111072007.41353.arnd@arndb.de> References: <20111107103313.6e1067675b2cd2f2de6bded7@canb.auug.org.au> Mime-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Return-path: 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 In-Reply-To: <20111107103313.6e1067675b2cd2f2de6bded7@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, 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