diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-31 01:06:04 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-31 01:06:04 +0200 |
| commit | cf2f7d7c90279cdbc12429de278f3d27ac2050ae (patch) | |
| tree | c84bb54712f566e6497ccadd1ae9f42b4baf0c63 /arch/cris/Kconfig | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/raf... (diff) | |
| parent | Revert "proc: revert /proc/uptime to ->read_proc hook" (diff) | |
| download | linux-cf2f7d7c90279cdbc12429de278f3d27ac2050ae.tar.xz linux-cf2f7d7c90279cdbc12429de278f3d27ac2050ae.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:
Revert "proc: revert /proc/uptime to ->read_proc hook"
proc 2/2: remove struct proc_dir_entry::owner
proc 1/2: do PDE usecounting even for ->read_proc, ->write_proc
proc: fix sparse warnings in pagemap_read()
proc: move fs/proc/inode-alloc.txt comment into a source file
Diffstat (limited to 'arch/cris/Kconfig')
0 files changed, 0 insertions, 0 deletions