Hi Al,

On Fri, 18 Jul 2008 15:27:58 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the vfs tree got a conflict in
> security/dummy.c between commit 5915eb53861c5776cfec33ca4fcc1fd20d66dd27
> ("security: remove dummy module") from the  tree and commit
                                         ^^^^^^^^^
Linus' tree

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