aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss/midi_synth.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-08 13:58:45 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-08 13:58:45 -0400
commitf589274533eb94e0217acc1db6240ce6e621bb56 (patch)
tree884d4fde45bd578a240b4a61fe8de3b6a4c13880 /sound/oss/midi_synth.c
parent625fc3a37511cbecfe1253867fe105c28d6a95f0 (diff)
parente3a2efa67a029453b8098dba179ec2d9d8df612e (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: [ALSA] soc at91 minor bug fixes [ALSA] soc - at91-pcm - Fix line wrapping pcspkr: fix dependancies
Diffstat (limited to 'sound/oss/midi_synth.c')
0 files changed, 0 insertions, 0 deletions