drivers/base/firmware_class.c      |    3 
 drivers/block/ub.c                 |    1 
 drivers/char/hw_random/intel-rng.c |    2 
 fs/drop_caches.c                   |    4 
 fs/stack.c                         |   58 ++
 fs/unionfs/Makefile                |    4 
 fs/unionfs/commonfops.c            |   32 -
 fs/unionfs/copyup.c                |   44 --
 fs/unionfs/debug.c                 |    8 
 fs/unionfs/dentry.c                |  123 ++---
 fs/unionfs/dirfops.c               |   28 -
 fs/unionfs/dirhelper.c             |  130 ------
 fs/unionfs/fanout.h                |  158 +++++--
 fs/unionfs/file.c                  |    6 
 fs/unionfs/inode.c                 |  211 ++--------
 fs/unionfs/lookup.c                |  766 ++++++++++++++++---------------------
 fs/unionfs/main.c                  |   40 -
 fs/unionfs/mmap.c                  |    6 
 fs/unionfs/rdstate.c               |    6 
 fs/unionfs/rename.c                |  206 +++------
 fs/unionfs/sioq.c                  |   24 -
 fs/unionfs/sioq.h                  |    6 
 fs/unionfs/subr.c                  |  209 ----------
 fs/unionfs/super.c                 |   16 
 fs/unionfs/union.h                 |   58 +-
 fs/unionfs/unlink.c                |   28 -
 fs/unionfs/whiteout.c              |  577 +++++++++++++++++++++++++++
 fs/unionfs/xattr.c                 |    6 
 include/linux/fs_stack.h           |    3 
 include/linux/mm.h                 |    2 
 include/linux/union_fs.h           |    6 
 31 files changed, 1381 insertions(+), 1390 deletions(-)

New commits:
commit 5c60321cc477f855512b5e4a970edc89432c283b
Author: Stephen Hemminger <[EMAIL PROTECTED]>
Date:   Tue Aug 5 09:48:06 2008 -0700

    Update to Unionfs 2.4
    
    Change to latest version of unionfs code.

commit abab0dd79f9b42b9550a3e05836a9c5e215ea814
Author: Stephen Hemminger <[EMAIL PROTECTED]>
Date:   Tue Aug 5 09:40:17 2008 -0700

    Remerge drivers
    
    The following driver seem to have diverged from the upstream 2.6.24.12
    code probably from failed merges.

http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=5c60321cc477f855512b5e4a970edc89432c283b
http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=abab0dd79f9b42b9550a3e05836a9c5e215ea814
_______________________________________________
svn mailing list
[email protected]
http://mailman.vyatta.com/mailman/listinfo/svn

Reply via email to