From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mx1.redhat.com ([209.132.183.28]:21679 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751503Ab0HKMtI (ORCPT ); Wed, 11 Aug 2010 08:49:08 -0400 Message-ID: <4C629C4C.2080509@redhat.com> Date: Wed, 11 Aug 2010 09:49:16 -0300 From: Mauro Carvalho Chehab MIME-Version: 1.0 To: Hans Verkuil CC: matti.j.aaltonen@nokia.com, "linux-media@vger.kernel.org" , Valentin Eduardo Subject: Re: A problem with http://git.linuxtv.org/media_tree.git References: <1280758003-16118-1-git-send-email-matti.j.aaltonen@nokia.com> <1280758003-16118-2-git-send-email-matti.j.aaltonen@nokia.com> <201008091838.13247.hverkuil@xs4all.nl> <1281425501.14489.7.camel@masi.mnp.nokia.com> <1281441830.14489.27.camel@masi.mnp.nokia.com> <4C614294.7080101@redhat.com> <1281518486.14489.43.camel@masi.mnp.nokia.com> <757d559ab06463d8b5e662b9aeeec701.squirrel@webmail.xs4all.nl> In-Reply-To: <757d559ab06463d8b5e662b9aeeec701.squirrel@webmail.xs4all.nl> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit List-ID: Sender: Mauro Carvalho Chehab Em 11-08-2010 07:56, Hans Verkuil escreveu: > >> Hi. >> >> I cloned your tree at http://linuxtv.org/git/media_tree.git and checked >> out the origin/staging/v2.6.37 branch and the >> Documentation/video4linux/v4l2-controls.txt just isn't there. I asked >> one of my colleagues to do the same and the result was also the same. > > The file is in the v2.6.36 branch. It hasn't been merged yet in the > v2.6.37 branch. I'll start working with v2.6.37 branch after the end of the merge window, pulling 2.6.36-rc1 there. Cheers, Mauro