lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  PHC 
Open Source and information security mailing list archives
 
Hash Suite for Android: free password hash cracker in your pocket
[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date:	Wed, 12 May 2010 10:23:17 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Mauro Carvalho Chehab <mchehab@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Brian Johnson <brijohn@...il.com>,
	Yong Zhang <yong.zhang0@...il.com>
Subject: Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree

Hi Mauro,

On Tue, 11 May 2010 20:23:08 -0300 Mauro Carvalho Chehab <mchehab@...radead.org> wrote:
>
> Conflicts solved. They were generated by an upstream merge from
> my fixes tree.

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists