summaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-06 03:34:12 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-06 03:34:12 +0100
commitc155b914651753f843445d2f860bc00137df5d52 (patch)
tree8a90674dfad7dd7e470d64819f8b7b490de35c2d /drivers/s390
parentMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cp... (diff)
parentMerge branch 'topic/misc' into for-linus (diff)
downloadlinux-c155b914651753f843445d2f860bc00137df5d52.tar.xz
linux-c155b914651753f843445d2f860bc00137df5d52.zip
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/s390')
0 files changed, 0 insertions, 0 deletions