Subject: linux-next: manual merge of the vfs tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 18 Jul 2008 15:27:58 +1000

Hi Al,

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
3a889e59496c03e409b66afa3ac9d91b6ff8a937 ("[PATCH] get rid of passing
nameidata to security_inode_permission()") from the vfs tree.

I removed the file.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/