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 /drivers/clocksource/acpi_pm.c | |
parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
parent | Fix CONFIG_AC97_BUS dependency (diff) | |
download | linux-dev-4747832b56a95dbeb0cef4714e6fcc766eed0a95.tar.xz linux-dev-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 'drivers/clocksource/acpi_pm.c')
0 files changed, 0 insertions, 0 deletions