From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 3 Nov 2008 17:59:01 +0000 (-0800)
Subject: Merge branch 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan... 
X-Git-Tag: v2.6.28-rc4~93
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c8126cc6025972629044cde750cec97f175792f7;p=linux-2.6-omap-h63xx.git

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
---

c8126cc6025972629044cde750cec97f175792f7