Merge home.transmeta.com:/home/torvalds/v2.5/nsec-stat

into home.transmeta.com:/home/torvalds/v2.5/linux

diff --cc drivers/md/md.c
Simple merge

diff --cc fs/dquot.c
Simple merge

diff --cc fs/ext3/inode.c
Simple merge

diff --cc fs/ext3/super.c
Simple merge

diff --cc fs/fat/inode.c
Simple merge

diff --cc fs/inode.c
Simple merge

diff --cc fs/nfs/inode.c
Simple merge

diff --cc fs/nfs/nfs2xdr.c
Simple merge

diff --cc fs/nfs/nfs3xdr.c
Simple merge

diff --cc fs/nfs/nfs4xdr.c
Simple merge

diff --cc fs/nfsd/export.c
Simple merge

diff --cc fs/nfsd/vfs.c
Simple merge

diff --cc fs/ntfs/inode.c
Simple merge

diff --cc fs/open.c
Simple merge

diff --cc fs/smbfs/dir.c
Simple merge

diff --cc fs/smbfs/inode.c
Simple merge

diff --cc fs/smbfs/proc.c
Simple merge

diff --cc fs/udf/ialloc.c
index 2eb7bea066a35a72d2e5397e3228be57ed3ac8c4,f76845e5e3f57736dc9a5e09b3485afe8565badf..35ffa13420d69f57b294ff7a123c6041fed68bd0
--- 1/fs/udf/ialloc.c
--- 2/fs/udf/ialloc.c
+++ b/fs/udf/ialloc.c
@@@ -156,10 -148,11 +156,10 @@@ struct inode * udf_new_inode (struct in
                UDF_I_ALLOCTYPE(inode) = ICBTAG_FLAG_AD_SHORT;
        else
                UDF_I_ALLOCTYPE(inode) = ICBTAG_FLAG_AD_LONG;
-       inode->i_mtime = inode->i_atime = inode->i_ctime =
-               UDF_I_CRTIME(inode) = CURRENT_TIME;
+       inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
+               UDF_I_CRTIME(inode) = get_seconds();
        UDF_I_UMTIME(inode) = UDF_I_UCTIME(inode) =
-               UDF_I_UCRTIME(inode) = CURRENT_UTIME;
+               UDF_I_UCRTIME(inode) = get_seconds();
 -      UDF_I_NEW_INODE(inode) = 1;
        insert_inode_hash(inode);
        mark_inode_dirty(inode);
  

diff --cc fs/udf/inode.c
Simple merge

diff --cc fs/udf/super.c
Simple merge

diff --cc fs/xfs/linux/xfs_super.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc kernel/ksyms.c
Simple merge

diff --cc net/sunrpc/cache.c
Simple merge

diff --cc net/sunrpc/xprt.c
Simple merge