Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
Linus Torvalds [Fri, 3 Apr 2009 04:09:10 +0000 (21:09 -0700)]
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  Remove two unneeded exports and make two symbols static in fs/mpage.c
  Cleanup after commit 585d3bc06f4ca57f975a5a1f698f65a45ea66225
  Trim includes of fdtable.h
  Don't crap into descriptor table in binfmt_som
  Trim includes in binfmt_elf
  Don't mess with descriptor table in load_elf_binary()
  Get rid of indirect include of fs_struct.h
  New helper - current_umask()
  check_unsafe_exec() doesn't care about signal handlers sharing
  New locking/refcounting for fs_struct
  Take fs_struct handling to new file (fs/fs_struct.c)
  Get rid of bumping fs_struct refcount in pivot_root(2)
  Kill unsharing fs_struct in __set_personality()

15 files changed:
1  2 
fs/buffer.c
fs/compat.c
fs/fat/inode.c
fs/hpfs/super.c
fs/nfs/nfs3proc.c
fs/nfs/nfs4proc.c
fs/nfsd/nfssvc.c
fs/omfs/inode.c
fs/proc/task_nommu.c
include/linux/buffer_head.h
include/linux/fs.h
include/linux/sched.h
kernel/exit.c
kernel/fork.c
kernel/sys.c

diff --cc fs/buffer.c
Simple merge
diff --cc fs/compat.c
Simple merge
diff --cc fs/fat/inode.c
Simple merge
diff --cc fs/hpfs/super.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/omfs/inode.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/exit.c
Simple merge
diff --cc kernel/fork.c
Simple merge
diff --cc kernel/sys.c
Simple merge