tree c84bb54712f566e6497ccadd1ae9f42b4baf0c63
parent 53d8f67082c9b86699dd88b7f9e667e245193f21
parent a9caa3de249a6c43bc9c6aec87881f09276677e3
author Linus Torvalds <torvalds@linux-foundation.org> 1238454364 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1238454364 -0700

Merge branch 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc

* 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc:
  Revert "proc: revert /proc/uptime to ->read_proc hook"
  proc 2/2: remove struct proc_dir_entry::owner
  proc 1/2: do PDE usecounting even for ->read_proc, ->write_proc
  proc: fix sparse warnings in pagemap_read()
  proc: move fs/proc/inode-alloc.txt comment into a source file