]> Git Repo - linux.git/commitdiff
Merge branch 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan...
authorLinus Torvalds <[email protected]>
Mon, 3 Nov 2008 17:59:01 +0000 (09:59 -0800)
committerLinus Torvalds <[email protected]>
Mon, 3 Nov 2008 17:59:01 +0000 (09:59 -0800)
* 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc:
  proc: revert /proc/uptime to ->read_proc hook


Trivial merge
This page took 0.053079 seconds and 4 git commands to generate.