summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-09-07 04:33:10 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-09-07 04:33:10 +0200
commit4747832b56a95dbeb0cef4714e6fcc766eed0a95 (patch)
tree48245f5eddd9a9222643d0405c18fc3e97dc79ce /arch/x86
parentMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff)
parentFix CONFIG_AC97_BUS dependency (diff)
downloadlinux-4747832b56a95dbeb0cef4714e6fcc766eed0a95.tar.xz
linux-4747832b56a95dbeb0cef4714e6fcc766eed0a95.zip
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
Diffstat (limited to 'arch/x86')
0 files changed, 0 insertions, 0 deletions