summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'topic/ps3' into for-linusTakashi Iwai2009-06-121-351/+304
|\
| * ALSA: sound/ps3: Correct existing and add missing annotationsGeert Uytterhoeven2009-06-101-6/+6
| * ALSA: sound/ps3: Restructure driver sourceGeert Uytterhoeven2009-06-101-333/+288
| * ALSA: sound/ps3: Fix checkpatch issuesGeert Uytterhoeven2009-06-101-17/+15
* | Merge branch 'topic/pcm-jiffies-check' into for-linusTakashi Iwai2009-06-121-14/+22
|\ \
| * | ALSA: pcm - Update document about xrun_debug proc fileTakashi Iwai2009-06-111-14/+22
* | | Merge branch 'topic/misc' into for-linusTakashi Iwai2009-06-121-1/+1
|\ \ \
| * | | ALSA: use card device as parent for jack input-devicesKay Sievers2009-06-101-1/+1
* | | | Merge branch 'topic/lx6464es' into for-linusTakashi Iwai2009-06-121-0/+7
|\ \ \ \
| * | | | ALSA: lx6464es - support standard alsa module parametersTim Blechmann2009-06-111-0/+7
* | | | | Merge branch 'topic/hda' into for-linusTakashi Iwai2009-06-121-0/+3
|\ \ \ \ \
| * | | | | ALSA: hda - add quirk for STAC92xx (SigmaTel STAC9205)Simos Xenitellis2009-06-101-0/+3
* | | | | | Merge branch 'topic/caiaq' into for-linusTakashi Iwai2009-06-121-1/+2
|\ \ \ \ \ \
| * | | | | | ALSA: snd_usb_caiaq: set mixernameDaniel Mack2009-06-111-1/+2
* | | | | | | Merge branch 'topic/asoc' into for-linusTakashi Iwai2009-06-121-6/+10
|\ \ \ \ \ \ \
| * | | | | | | ASoC: Fix lm4857 controlMark Brown2009-06-101-6/+10
* | | | | | | | Merge branch 'topic/usb-audio' into for-linusTakashi Iwai2009-06-102-0/+68
|\ \ \ \ \ \ \ \
| * | | | | | | | ALSA: usb - Add boot quirk for C-Media 6206 USB AudioDan Allongo2009-06-081-0/+25
| * | | | | | | | ALSA: usb-audio - errata corrige for quirkAndrea Borgia2009-06-031-1/+1
| * | | | | | | | ALSA: usb-audio - Add quirk for Roland/Edirol M-16DXTakashi Iwai2009-06-011-0/+35
| * | | | | | | | ALSA: usb-audio - quirk for USB Aureon cardsAndrea Borgia2009-06-011-0/+8
* | | | | | | | | Merge branch 'topic/seq-kconfig-cleanup' into for-linusTakashi Iwai2009-06-109-69/+31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ALSA: clean up the logic for building sequencer modulesMichal Marek2009-05-299-69/+31
* | | | | | | | | | Merge branch 'topic/section-fix' into for-linusTakashi Iwai2009-06-1010-59/+59
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | ALSA: Add missing __devexit_p() markersJean Delvare2009-06-043-3/+3
| * | | | | | | | | | ALSA: powermac - Replace the rest of __init*Takashi Iwai2009-06-034-44/+44
| * | | | | | | | | | ALSA: sound/ppc: update annotations of serveral functionsStephen Rothwell2009-06-037-12/+12
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'topic/sc6000' into for-linusTakashi Iwai2009-06-103-31/+114
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | ALSA: sc6000: enable joystick portKrzysztof Helt2009-05-042-3/+10
| * | | | | | | | | | ALSA: sc6000: fix older card initializationKrzysztof Helt2009-04-241-10/+12
| * | | | | | | | | | ALSA: sc6000: add support for SC-6600 and SC-7000Krzysztof Helt2009-04-142-30/+104
* | | | | | | | | | | Merge branch 'topic/riptide' into for-linusTakashi Iwai2009-06-101-187/+160
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ALSA: riptide - Fix joystick resource handlingTakashi Iwai2009-05-261-35/+26
| * | | | | | | | | | | ALSA: riptide - Code clean upTakashi Iwai2009-05-261-152/+134
* | | | | | | | | | | | Merge branch 'topic/pcm-subclass-fix' into for-linusTakashi Iwai2009-06-102-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ALSA: Remove invalid GENERIC_MIX PCM sublassTakashi Iwai2009-06-022-2/+0
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'topic/pcm-jiffies-check' into for-linusTakashi Iwai2009-06-104-22/+84
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | ALSA: pcm - A helper function to compose PCM stream name for debug printsTakashi Iwai2009-06-081-6/+17
| * | | | | | | | | | | ALSA: pcm - Fix update of runtime->hw_ptr_interruptTakashi Iwai2009-06-071-1/+2
| * | | | | | | | | | | ALSA: pcm - Fix a typo in hw_ptr update checkJaroslav Kysela2009-06-061-1/+1
| * | | | | | | | | | | ALSA: PCM midlevel: lower jiffies check margin using runtime->delay valueJaroslav Kysela2009-05-291-2/+10
| * | | | | | | | | | | ALSA: PCM midlevel: Do not update hw_ptr_jiffies when hw_ptr is not changedJaroslav Kysela2009-05-291-2/+14
| * | | | | | | | | | | ALSA: PCM midlevel: introduce mask for xrun_debug() macroJaroslav Kysela2009-05-291-9/+9
| * | | | | | | | | | | ALSA: PCM midlevel: improve fifo_size handlingJaroslav Kysela2009-05-294-3/+33
| * | | | | | | | | | | Merge branch 'fix/pcm-jiffies-check' into topic/pcm-jiffies-checkTakashi Iwai2009-05-29961-10184/+28525
| |\ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | Merge branch 'topic/pcm-delay' into for-linusTakashi Iwai2009-06-103-4/+19
|\| | | | | | | | | | | |
| * | | | | | | | | | | | ALSA: usbaudio - Add delay accountTakashi Iwai2009-05-051-1/+13
| * | | | | | | | | | | | ALSA: Add extra delay count in PCMTakashi Iwai2009-05-052-3/+6
* | | | | | | | | | | | | Merge branch 'topic/oxygen' into for-linusTakashi Iwai2009-06-104-24/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | sound: virtuoso: add Xonar Essence ST supportClemens Ladisch2009-05-253-22/+45