Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

* 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (165 commits)
  reiserfs: Properly display mount options in /proc/mounts
  vfs: prevent remount read-only if pending removes
  vfs: count unlinked inodes
  vfs: protect remounting superblock read-only
  vfs: keep list of mounts for each superblock
  vfs: switch ->show_options() to struct dentry *
  vfs: switch ->show_path() to struct dentry *
  vfs: switch ->show_devname() to struct dentry *
  vfs: switch ->show_stats to struct dentry *
  switch security_path_chmod() to struct path *
  vfs: prefer ->dentry->d_sb to ->mnt->mnt_sb
  vfs: trim includes a bit
  switch mnt_namespace ->root to struct mount
  vfs: take /proc/*/mounts and friends to fs/proc_namespace.c
  vfs: opencode mntget() mnt_set_mountpoint()
  vfs: spread struct mount - remaining argument of next_mnt()
  vfs: move fsnotify junk to struct mount
  vfs: move mnt_devname
  vfs: move mnt_list to struct mount
  vfs: switch pnode.h macros to struct mount *
  ...

diff --cc Documentation/filesystems/debugfs.txt
Simple merge

diff --cc arch/powerpc/include/asm/spu.h
Simple merge

diff --cc arch/powerpc/include/asm/types.h
Simple merge

diff --cc block/ioctl.c
Simple merge

diff --cc drivers/base/core.c
Simple merge

diff --cc drivers/base/devtmpfs.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
Simple merge

diff --cc drivers/scsi/cxgbi/libcxgbi.c
Simple merge

diff --cc drivers/staging/iio/adc/ad7192.c
Simple merge

diff --cc drivers/staging/iio/dac/ad5446.c
Simple merge

diff --cc drivers/staging/iio/dds/ad9834.c
Simple merge

diff --cc drivers/usb/class/usblp.c
Simple merge

diff --cc drivers/usb/misc/iowarrior.c
Simple merge

diff --cc drivers/usb/misc/legousbtower.c
Simple merge

diff --cc fs/cifs/connect.c
Simple merge

diff --cc fs/debugfs/file.c
Simple merge

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

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

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

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

diff --cc kernel/acct.c
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc kernel/trace/trace.h
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc net/unix/af_unix.c
Simple merge

diff --cc security/selinux/hooks.c
Simple merge