Merge branch 'topic/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
authorJaroslav Kysela <perex@perex.cz>
Tue, 16 Feb 2010 10:25:03 +0000 (11:25 +0100)
committerJaroslav Kysela <perex@perex.cz>
Tue, 16 Feb 2010 10:25:03 +0000 (11:25 +0100)
commitb8f1f5983fbe751aa3d07d9ce7ebb0c23bf4b7e4
treee9f11863f683a9f4eb03d76008740a36d6b4ff3c
parentba9341dfef6b0201cd30e3904dcd0a47d3dc35e0
parent47b5d028fdce8f809bf22852ac900338fb90e8aa
Merge branch 'topic/misc' of git://git./linux/kernel/git/tiwai/sound-2.6 into devel
sound/oss/soundcard.c
sound/pci/ctxfi/ctatc.c
sound/usb/usbaudio.c
sound/usb/usbquirks.h