tree efe7ebfe951972568189ef2548130f0abd515210
parent 9c4bc1c2befbbdce4b9fd526e67a7a2ea143ffa2
parent f20877d94a74557b7c28b4ed8920d834c31e0ea5
author Linus Torvalds <torvalds@linux-foundation.org> 1294978453 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1294978453 -0800

Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin

* 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin:
  fs: fix do_last error case when need_reval_dot
  nfs: add missing rcu-walk check
  fs: hlist UP debug fixup
  fs: fix dropping of rcu-walk from force_reval_path
  fs: force_reval_path drop rcu-walk before d_invalidate
  fs: small rcu-walk documentation fixes

Fixed up trivial conflicts in Documentation/filesystems/porting