aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-03-01 12:38:59 +0100
committerTakashi Iwai <tiwai@suse.de>2010-03-01 12:38:59 +0100
commit6679ee1870f7ccdd48e2e5c57919240b8f19a6dc (patch)
tree225ed7efcc0bb7e3c90233576c6106538e17a275 /sound/oss
parentMerge branch 'topic/hda' into for-linus (diff)
parentMerge branch 'for-2.6.34' of git://opensource.wolfsonmicro.com/linux-2.6-asoc into topic/asoc (diff)
downloadlinux-dev-6679ee1870f7ccdd48e2e5c57919240b8f19a6dc.tar.xz
linux-dev-6679ee1870f7ccdd48e2e5c57919240b8f19a6dc.zip
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/oss')
0 files changed, 0 insertions, 0 deletions