Merge branch 'fix/ctxfi' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Tue, 21 Jul 2009 17:03:19 +0000 (19:03 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 21 Jul 2009 17:03:19 +0000 (19:03 +0200)
commit36766835ed17f0a10039272693d3c17e8f8a5142
treedeeaee624d39b959ee2e5235b4f54f9436f7b43b
parent15c2ac051c730210b7ef2c93807b576e89e129d2
parent55fe27f7e2c9d24ce870136bd99ae67b020122d1
Merge branch 'fix/ctxfi' into for-linus

* fix/ctxfi:
  ALSA: ctxfi: Swapped SURROUND-SIDE channels on emu20k2