summaryrefslogtreecommitdiff
path: root/drivers/net/dummy.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-21 13:24:33 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-21 13:24:33 -0800
commit7971b96d922ccaaa2b732462c8f927af4259db60 (patch)
tree192d1e47a78fffe98bdaaa59185886fd23162922 /drivers/net/dummy.c
parentc745552a82cbf3a82adea5210212ed31ec03388d (diff)
parent842a2097007b8a01a71a701300e970502a54bbb2 (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: ALSA: hda - Fix EAPD to low on CZC P10T tablet computer with ALC662 ALSA: HDA: Add SKU ignore for another Thinkpad Edge 14 ALSA: hda - Fix "unused variable" compile warning ALSA: hda - Add quirk for HP Z-series workstation Revert "ALSA: HDA: Create mixers on ALC887" ASoC: PXA: Fix codec address on Zipit Z2 ASoC: PXA: Fix jack detection on Zipit Z2 ASoC: Blackfin: fix DAI/SPORT config dependency issues ASoC: Blackfin TDM: use external frame syncs ASoC: Blackfin AC97: fix build error after multi-component update ASoC: Blackfin TDM: fix missed snd_soc_dai_get_drvdata update ASoC: documentation updates ALSA: ice1712 delta - initialize SPI clock
Diffstat (limited to 'drivers/net/dummy.c')
0 files changed, 0 insertions, 0 deletions