Merge branch 'topic/misc' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:35:50 +0000 (00:35 +0100)]
25 files changed:
1  2 
include/sound/pcm.h
sound/arm/sa11xx-uda1341.c
sound/core/oss/pcm_oss.c
sound/core/pcm.c
sound/drivers/mtpav.c
sound/drivers/mts64.c
sound/drivers/pcsp/pcsp.c
sound/drivers/serial-u16550.c
sound/drivers/virmidi.c
sound/mips/au1x00.c
sound/pci/ali5451/ali5451.c
sound/pci/als300.c
sound/pci/azt3328.c
sound/pci/ca0106/ca0106_main.c
sound/pci/cs4281.c
sound/pci/cs5535audio/cs5535audio.c
sound/pci/ens1370.c
sound/pci/es1938.c
sound/pci/mixart/mixart_hwdep.c
sound/pci/sonicvibes.c
sound/pci/via82xx.c
sound/pci/via82xx_modem.c
sound/sparc/amd7930.c
sound/usb/usx2y/usX2Yhwdep.c
sound/usb/usx2y/usbusx2y.c

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