diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-04 09:39:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-04 09:39:12 -0800 |
| commit | 9dfea1b46d9f147478ccdfa4a4ef472fdc98d6dd (patch) | |
| tree | 4338700a76ef4f79142048b9363adff55575bc1f /fs/dlm/member.h | |
| parent | eda58a85ec3fc05855a26654d97a2b53f0e715b9 (diff) | |
| parent | 7df0eb424d7f5bfb948c921500e0470f4a27c4cb (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: pcm_oss: AFMT_S24_LE is set twice in return value
ALSA: ASoC: email - update email addresses.
OMAP: ASoC: Fix spinlock misuse in omap-pcm.c
ALSA: hda - No widget selection for volume knob widgets in proc output
ALSA: hda - Add support of iMac 24 Aluminium
ALSA: alsa: time reaches -1, tested 0
ALSA: hda - Add quirk for another HP dv5 model
Diffstat (limited to 'fs/dlm/member.h')
0 files changed, 0 insertions, 0 deletions