From: Linus Torvalds Date: Tue, 15 Jan 2008 16:08:40 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 X-Git-Tag: v2.6.24-rc8~5 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3568834e813e0dd7547035b3148b2f2a2b48ee4e;p=linux-2.6-omap-h63xx.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 * git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: x86: fix RTC_AIE with CONFIG_HPET_EMULATE_RTC x86: asm-x86/msr.h: pull in linux/types.h x86: fix boot crash on HIGHMEM4G && SPARSEMEM --- 3568834e813e0dd7547035b3148b2f2a2b48ee4e