diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-06 19:33:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-06 19:33:10 -0700 |
| commit | 4747832b56a95dbeb0cef4714e6fcc766eed0a95 (patch) | |
| tree | 48245f5eddd9a9222643d0405c18fc3e97dc79ce /arch/x86/kernel/hpet.c | |
| parent | a22a9a90cfbcc91c3e0f8dc8549535e2786d3e7e (diff) | |
| parent | 8a656496b21efd95fd55b66e0601c5ad41f9b156 (diff) | |
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/kernel/hpet.c')
0 files changed, 0 insertions, 0 deletions