Merge branch 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Nov 2008 17:59:01 +0000 (09:59 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Nov 2008 17:59:01 +0000 (09:59 -0800)
commitc8126cc6025972629044cde750cec97f175792f7
treed80782c2ddfb17f6bc49a85fb932b5854f5af73a
parent30ef898c535bffd105c1a9b9b6563969b3deb31e
parent6c87df37dcb9c6c33923707fa5191e0a65874d60
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:
  proc: revert /proc/uptime to ->read_proc hook