Merge branch 'topic/misc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 22 Jul 2011 06:43:24 +0000 (08:43 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 22 Jul 2011 06:43:24 +0000 (08:43 +0200)
commit7d339ae99758bc21033d4a19bcd4f7b55f96e24e
treea5bb46e47f7c4ae193cdf1a73c361144d6099df8
parent13b137ef0367237909bb2dc38babfb8305154676
parent000477a0fe1af14355a52622a77ccce8bfd7230d
Merge branch 'topic/misc' into for-linus
sound/pci/asihpi/asihpi.c
sound/pci/rme9652/hdspm.c