diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-03 09:59:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-03 09:59:01 -0800 |
| commit | c8126cc6025972629044cde750cec97f175792f7 (patch) | |
| tree | d80782c2ddfb17f6bc49a85fb932b5854f5af73a /fs/ubifs/commit.c | |
| parent | Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (diff) | |
| parent | proc: revert /proc/uptime to ->read_proc hook (diff) | |
| download | linux-dev-c8126cc6025972629044cde750cec97f175792f7.tar.xz linux-dev-c8126cc6025972629044cde750cec97f175792f7.zip | |
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
Diffstat (limited to 'fs/ubifs/commit.c')
0 files changed, 0 insertions, 0 deletions