summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-23 19:42:55 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-23 19:42:55 +0200
commiteb81071584bed0b04adcaf57e525638d0f92e1e1 (patch)
treeefd7f5a56299acf9ce96870a7e6e0d353330bdce /net
parentcompat_blkdev_driver_ioctl: Remove unused variable warning (diff)
parentMerge branches 'topic/asoc', 'topic/misc-fixes' and 'topic/hda' into for-linus (diff)
downloadlinux-eb81071584bed0b04adcaf57e525638d0f92e1e1.tar.xz
linux-eb81071584bed0b04adcaf57e525638d0f92e1e1.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: aoa i2sbus: don't overwrite module parameter ALSA: ASoC: tlv320aic3x: Fix DSP DAI format and signal polarities matching ALSA: ASoC: OMAP: Continue fixing DSP DAI format in McBSP DAI driver ALSA: Ensure PXA runtime data is initialised ALSA: hda - correct bracketing in spdif test in patch_sigmatel.c ALSA: hda - Fix conflicting volume controls on ALC260
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions