Merge branch 'topic/echoaudio' into for-linus
commitc9294e4b3793e2bd397691ae015283eecca29562
authorTakashi Iwai <tiwai@suse.de>
Mon, 23 Mar 2009 23:36:07 +0000 (24 00:36 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 23 Mar 2009 23:36:07 +0000 (24 00:36 +0100)
treea8f59a67b1540565000ee679615641dcc1255307
parentae02cde7e9bc7bb4cb48b1798479889f043ba2ae
parenta2328d0249fce44381289525bd580b37d2105963
Merge branch 'topic/echoaudio' into for-linus
sound/pci/echoaudio/echoaudio.c
sound/pci/echoaudio/mia_dsp.c