Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
commitb53d0b919ebe227e2b8e49b6e0ddee506be83aa8
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 23 Jan 2007 19:06:05 +0000 (23 11:06 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 23 Jan 2007 19:06:05 +0000 (23 11:06 -0800)
tree61ee610f1f61b16137c1dda5bdcac21b4c12ced1
parentfe6ea1f7e5c2d3947bf62f2a219e69718ca0b187
parentbc6191b10018311a301fb6ef22994177c769b868
Merge branch 'linus' of /linux/kernel/git/perex/alsa

* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
  [ALSA] Repair snd-usb-usx2y over OHCI