diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-12 08:32:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-12 08:32:47 -0700 |
| commit | b637dc0dba6a243da2c74f5d02b42ba5eeb9425e (patch) | |
| tree | ccf2a7808a2f97b09caee74266e1303f76a990d0 /fs/ncpfs/ncplib_kernel.c | |
| parent | 42c5c8435e8b7da4684607587d2c882d464cfc7d (diff) | |
| parent | 8884be98bcfa656febd24bd18fe8bececbf81251 (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: hda - Don't override ADC definitions for ALC codecs
ALSA: hda - Add missing vmaster initialization for ALC269
ASoC: Add missing DRV_NAME definitions for fsl/* drivers
Diffstat (limited to 'fs/ncpfs/ncplib_kernel.c')
0 files changed, 0 insertions, 0 deletions