]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 15 Jan 2008 16:08:40 +0000 (08:08 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 15 Jan 2008 16:08:40 +0000 (08:08 -0800)
commit12c155d83f5e0d4e406e83bfdec791c62534992a
tree19dfbffbaba9c1b021f4ef2df783c3a3513a0891
parentc67dadc274cc228ffce385c7d6bf1d8994ce7260
parent4b05e9e7637dace90842c71baddfe2b342dc0223
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