diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-03 18:59:01 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-03 18:59:01 +0100 |
| commit | c8126cc6025972629044cde750cec97f175792f7 (patch) | |
| tree | d80782c2ddfb17f6bc49a85fb932b5854f5af73a /sound/isa/cs423x/cs4236.c | |
| parent | Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airl... (diff) | |
| parent | proc: revert /proc/uptime to ->read_proc hook (diff) | |
| download | linux-c8126cc6025972629044cde750cec97f175792f7.tar.xz linux-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 'sound/isa/cs423x/cs4236.c')
0 files changed, 0 insertions, 0 deletions