diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-05 11:11:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-05 11:11:34 -0800 |
| commit | 9d9c3a51e7b20dcd63b8cc534035af99a41d03e4 (patch) | |
| tree | 2e480f5e80869e22b119fa0c25e48124743e95fc /drivers/net/wireless/ath/ath9k/main.c | |
| parent | 56dca4ceb7b39aa4173aa1cb822c860ced2be1ec (diff) | |
| parent | 3e0b33f786e7f950f2430a305169f3db4a1a5521 (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:
ASoC: pandora: Add APLL supply to fix audio output
ALSA: ice1724 - aureon - fix wm8770 volume offset
ALSA: cosmetic: make hda intel interrupt name consistent with others
ALSA: hda - Delay switching to polling mode if an interrupt was missing
ALSA: ctxfi - fix PTP address initialization
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
0 files changed, 0 insertions, 0 deletions