aboutsummaryrefslogtreecommitdiff
path: root/sound/aoa
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-27 17:49:50 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-27 17:49:50 -0700
commitb9099ff63c75216d6ca10bce5a1abcd9293c27e6 (patch)
tree244c167220a1921156cdf24eb19f663f25e9c517 /sound/aoa
parent940155309cd037d3a49ad01276e591b872e8a832 (diff)
parentdc5a144991ba803bc8afded105c9db1dea0e57ab (diff)
downloadlinux-b9099ff63c75216d6ca10bce5a1abcd9293c27e6.tar.gz
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: sis900: Allocate rx replacement buffer before rx operation usb-net/pegasus: simplify carrier detection
Diffstat (limited to 'sound/aoa')
0 files changed, 0 insertions, 0 deletions