diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 05:34:12 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 05:34:12 +0300 |
| commit | c155b914651753f843445d2f860bc00137df5d52 (patch) | |
| tree | 8a90674dfad7dd7e470d64819f8b7b490de35c2d /drivers/net/mac89x0.c | |
| parent | e9af797d757d358f60130de6ca59ee658d666561 (diff) | |
| parent | 3a5e1d1792729f384c10db966feb8bab76c991ed (diff) | |
| download | linux-c155b914651753f843445d2f860bc00137df5d52.tar.xz | |
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:
ALSA: ice1724 - Fix a typo in IEC958 PCM name
ASoC: fix davinci-sffsdr buglet
ALSA: sound/usb: Use negated usb_endpoint_xfer_control, etc
ALSA: hda - cxt5051 report jack state
ALSA: hda - add basic jack reporting functions to patch_conexant.c
ALSA: Use usb_set/get_intfdata
ASoC: Clean up kerneldoc warnings
ASoC: Fix pxa2xx-pcm checks for invalid DMA channels
LSA: hda - Add HP Acacia detection
ALSA: hda - fix name for ALC1200
ALSA: sound/usb: use USB API functions rather than constants
ASoC: TWL4030: DAPM based capture implementation
ASoC: TWL4030: Make the enum filter generic for twl4030
Diffstat (limited to 'drivers/net/mac89x0.c')
0 files changed, 0 insertions, 0 deletions