| commit | c8126cc6025972629044cde750cec97f175792f7 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Nov 03 09:59:01 2008 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Nov 03 09:59:01 2008 -0800 |
| tree | d80782c2ddfb17f6bc49a85fb932b5854f5af73a | |
| parent | 30ef898c535bffd105c1a9b9b6563969b3deb31e [diff] | |
| parent | 6c87df37dcb9c6c33923707fa5191e0a65874d60 [diff] |
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