aboutsummaryrefslogtreecommitdiff
path: root/sound/isa
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-08-20 22:14:26 +0200
committerTakashi Iwai <tiwai@suse.de>2012-08-20 22:14:26 +0200
commitddf83485d7da468251716b8040bac1280622181e (patch)
treed28e9b511dedcfed447577f4bb49a99b244a9430 /sound/isa
parent099d53c308f50e8ee5b6638ec3f40f0104b3ee31 (diff)
parent535b6c51fe8293c88ce919cdfc4390c67a1cb6d1 (diff)
downloadlinux-ddf83485d7da468251716b8040bac1280622181e.tar.gz
Merge branch 'for-linus' into for-next
Conflicts: sound/pci/hda/hda_codec.c Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa')
0 files changed, 0 insertions, 0 deletions