aboutsummaryrefslogtreecommitdiff
path: root/arch/um/os-Linux/main.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-13 09:49:06 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-13 09:49:06 -0700
commit5dc93cf4576125f07cfc1b29cab0c9344c5b3d2b (patch)
treed72e52a182e1b90d5834c7707857732795d433ef /arch/um/os-Linux/main.c
parent43f14d856f013a4cc63da2c765617c665274338c (diff)
parent3c17279137bf8318438510b48229d4236f773da4 (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] ASoC: Fix wrong enum count for jack_function in N810 machine driver [ALSA] ASoC: build fix for snd_soc_info_bool_ext [ALSA] ASoC: Fix TLV320AIC3X mono line output interconnect [ALSA] soc - fsl_ssi.c fix "BUG: scheduling while atomic" [ALSA] emux midi synthesizer doesn't honor SOFT_PEDAL-release event
Diffstat (limited to 'arch/um/os-Linux/main.c')
0 files changed, 0 insertions, 0 deletions