summaryrefslogtreecommitdiffstats
path: root/sound/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-11-03 09:59:01 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-03 09:59:01 -0800
commitc8126cc6025972629044cde750cec97f175792f7 (patch)
treed80782c2ddfb17f6bc49a85fb932b5854f5af73a /sound/drivers
parent30ef898c535bffd105c1a9b9b6563969b3deb31e (diff)
parent6c87df37dcb9c6c33923707fa5191e0a65874d60 (diff)
downloadblackbird-op-linux-c8126cc6025972629044cde750cec97f175792f7.tar.gz
blackbird-op-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/drivers')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud