Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

Browse source

* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
  x86: fix x86-32 early fixmap initialization.
  x86: disable hpet legacy replacement for kdump
  x86: disable hpet on shutdown

...

This commit is contained in:

Linus Torvalds 2007-12-03 08:45:15 -08:00

parent f589b86d4b 17d57a9206

commit 1a2edea9af

6 changed files with 33 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

arch/x86/kernel/crash.c

View file

12

arch/x86/kernel/head_32.S

View file

14

arch/x86/kernel/hpet.c

View file

4

arch/x86/kernel/reboot_32.c

View file

4

arch/x86/kernel/reboot_64.c

View file