aboutsummaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-05-26 15:13:33 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-26 15:13:33 -0700
commitecd68853b852cdafb138f9c437f3a751fe7dc381 (patch)
tree6b3a3468d0d3dca7f226de7e3551913d907b17a2 /include/sound
parent087377a4307e18225f6452af5e71fe763c088c4e (diff)
parent3041a069090224462e27da1bc9483b463eb40841 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [NET]: dev.c comment fixes [IPV6] ROUTE: Don't try less preferred routes for on-link routes. [IRDA]: *_DONGLE should depend on IRTTY_SIR [MAINTAINERS]: Add entry for netem
Diffstat (limited to 'include/sound')
0 files changed, 0 insertions, 0 deletions