tree d80782c2ddfb17f6bc49a85fb932b5854f5af73a
parent 30ef898c535bffd105c1a9b9b6563969b3deb31e
parent 6c87df37dcb9c6c33923707fa5191e0a65874d60
author Linus Torvalds <torvalds@linux-foundation.org> 1225735141 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1225735141 -0800

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:
  proc: revert /proc/uptime to ->read_proc hook