Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 7 Sep 2008 02:33:10 +0000 (19:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 7 Sep 2008 02:33:10 +0000 (19:33 -0700)
commit4747832b56a95dbeb0cef4714e6fcc766eed0a95
tree48245f5eddd9a9222643d0405c18fc3e97dc79ce
parenta22a9a90cfbcc91c3e0f8dc8549535e2786d3e7e
parent8a656496b21efd95fd55b66e0601c5ad41f9b156
Merge branch 'for-linus' of git://git./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