From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 30 Mar 2009 23:06:04 +0000 (-0700)
Subject: Merge branch 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=cf2f7d7c90279cdbc12429de278f3d27ac2050ae;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'proc-linus' of git://git./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
---

cf2f7d7c90279cdbc12429de278f3d27ac2050ae