Commit edfd222f authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'x86-fixes-for-linus' of...

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, vmi: fix broken LDT access
  x86: fix typo in enable_mtrr_cleanup early parameter
parents d6478fad dc63b526
...@@ -834,7 +834,7 @@ static int __init enable_mtrr_cleanup_setup(char *str) ...@@ -834,7 +834,7 @@ static int __init enable_mtrr_cleanup_setup(char *str)
enable_mtrr_cleanup = 1; enable_mtrr_cleanup = 1;
return 0; return 0;
} }
early_param("enble_mtrr_cleanup", enable_mtrr_cleanup_setup); early_param("enable_mtrr_cleanup", enable_mtrr_cleanup_setup);
struct var_mtrr_state { struct var_mtrr_state {
unsigned long range_startk; unsigned long range_startk;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment