From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mx1.redhat.com ([209.132.183.28]:28938 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751874Ab0GZSdZ (ORCPT ); Mon, 26 Jul 2010 14:33:25 -0400 Message-ID: <4C4DD50A.2070609@redhat.com> Date: Mon, 26 Jul 2010 15:33:46 -0300 From: Mauro Carvalho Chehab MIME-Version: 1.0 To: Stefan Ringel CC: Linux Media Mailing List Subject: Re: tm6000 bad marge staging/tm6000 into staging/all References: <4C4BE78A.4090002@arcor.de> <4C4C7B51.3000608@redhat.com> <4C4DA709.3090706@arcor.de> In-Reply-To: <4C4DA709.3090706@arcor.de> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Sender: linux-media-owner@vger.kernel.org List-ID: Em 26-07-2010 12:17, Stefan Ringel escreveu: > Am 25.07.2010 19:58, schrieb Mauro Carvalho Chehab: >> Em 25-07-2010 04:28, Stefan Ringel escreveu: >>> -----BEGIN PGP SIGNED MESSAGE----- >>> Hash: SHA1 >>> >>> Hi Mauro, >>> >>> This marge are wrong! It's added double dvb led off, but my patch has >>> only ones. >>> >>> raw | combined (merge: 011906d 6e5e76f) >>> >>> Merge branch 'staging/tm6000' into staging/all >>> Mauro Carvalho Chehab [Sun, 4 Jul 2010 19:33:26 +0000 (16:33 -0300)] >>> >> break every clone of my tree. > cannot found staging/all. Sorry, I meant staging/other. staging/all is an internal temporary branch I used locally. Cheers, Mauro