linux-next: manual merge of the userns tree
From: Stephen Rothwell <hidden>
Date: 2008-11-05 05:33:28
Hi Serge, Today's linux-next merge of the userns tree got conflicts caused by the creds tree that the userns tree is based on. I excluded the creds tree (since the conflicts were a bit complex) so I need to exclude the userns tree as well for today. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/