]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit026196180e6befa66f7e8528f4b4da117e2b8f39
treed80782c2ddfb17f6bc49a85fb932b5854f5af73a
parentad4a03917758e17cf1cb152dc1f24a39e3341196
parentdb0c82800883b1a451eb5317aaa286f7dbbab3b5
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