summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/p54/p54usb.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-11-18 23:59:49 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-18 23:59:49 +0100
commit70b172b2989685a16cb47224678b9290d73fcd18 (patch)
treeb56a073103c8e682acfff97d841a3e15dfbdf10d /drivers/net/wireless/p54/p54usb.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parentMerge branch 'fix/asoc' into for-linus (diff)
downloadlinux-70b172b2989685a16cb47224678b9290d73fcd18.tar.xz
linux-70b172b2989685a16cb47224678b9290d73fcd18.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: ASoC: tlv320aic23 fix rate selection ASoC: OMAP3 Pandora: update for TWL4030 codec changes ASoC: Modifying the license string GPLv2 for OMAP3 EVM ALSA: hda - Fix quirk for VAIO type G ALSA: usb - Quirk to disable master volume control in PCM2702
Diffstat (limited to 'drivers/net/wireless/p54/p54usb.c')
0 files changed, 0 insertions, 0 deletions