tree 48245f5eddd9a9222643d0405c18fc3e97dc79ce
parent a22a9a90cfbcc91c3e0f8dc8549535e2786d3e7e
parent 8a656496b21efd95fd55b66e0601c5ad41f9b156
author Linus Torvalds <torvalds@linux-foundation.org> 1220754790 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1220754790 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  Fix CONFIG_AC97_BUS dependency