diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-04 09:46:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-04 09:46:13 -0700 |
| commit | f1a745710f001e8c2eec6d525396083e1f4c389a (patch) | |
| tree | 1acdad25c4f232bf8efaa8608eaec3feb64ea016 /drivers/net/pppox.c | |
| parent | 29f31773e07772e73e3177a4af147244cd080554 (diff) | |
| parent | 7ce1695c40e765e99cd790f55fc68037bc05d080 (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:
sound: do not set DEVNAME for OSS devices
ALSA: hda - Add sanity check in PCM open callback
ALSA: hda - Call snd_pcm_lib_hw_rates() again after codec open callback
ALSA: hda - Avoid invalid formats and rates with shared SPDIF
ALSA: hda - Improve ASUS eeePC 1000 mixer
ALSA: hda - Add GPIO1 control at muting with HP laptops
ALSA: usx2y - reparent sound device
ALSA: snd_usb_caiaq: reparent sound device
sound: virtuoso: fix Xonar D1/DX silence after resume
ASoC: Only disable pxa2xx-i2s clocks if we enabled them
ALSA: hda - Add quirk for HP 6930p
ALSA: hda - Add missing static to patch_ca0110()
ASoC: OMAP: fix OMAP1510 broken PCM pointer callback
ASoC: remove BROKEN from Efika and pcm030 fabric drivers
ASoC: Fix typo in MPC5200 PSC AC97 driver Kconfig
Diffstat (limited to 'drivers/net/pppox.c')
0 files changed, 0 insertions, 0 deletions