Merge branch 'topic/vmaster-update' into topic/docbook-fix
Takashi Iwai [Mon, 9 Mar 2009 14:21:57 +0000 (15:21 +0100)]
14 files changed:
1  2 
Documentation/sound/alsa/DocBook/alsa-driver-api.tmpl
drivers/media/video/em28xx/em28xx-audio.c
drivers/media/video/saa7134/saa7134-alsa.c
include/linux/input.h
sound/arm/aaci.c
sound/core/jack.c
sound/drivers/mtpav.c
sound/pci/aw2/aw2-alsa.c
sound/pci/hda/hda_intel.c
sound/pci/intel8x0.c
sound/ppc/snd_ps3.c
sound/soc/soc-core.c
sound/usb/caiaq/caiaq-device.c
sound/usb/usbaudio.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge