]> git.hungrycats.org Git - linux/commit
Merge delerium.codemonkey.org.uk:/mnt/data/src/bk/bk-linus
authorDave Jones <davej@delerium.codemonkey.org.uk>
Mon, 23 Aug 2004 14:00:48 +0000 (15:00 +0100)
committerDave Jones <davej@delerium.codemonkey.org.uk>
Mon, 23 Aug 2004 14:00:48 +0000 (15:00 +0100)
commiteb2b0751879a78b6af1cb821f89642eb0b384d41
treef35a843d29c06bc31fa2482c559bba74ce148111
parent4d8021616effa7a49b6df2ad0083dcce6016a3a7
parenta0dea52bb03981cccc9ea6cb19e51c5587d4c441
Merge delerium.codemonkey.org.uk:/mnt/data/src/bk/bk-linus
into delerium.codemonkey.org.uk:/mnt/data/src/bk/cpufreq
arch/i386/kernel/smpboot.c
drivers/cpufreq/cpufreq_userspace.c
include/asm-i386/acpi.h