| commit | 2b04be7e8ab5756ea36e137dd03c8773d184e67e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jul 17 10:38:59 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jul 17 10:38:59 2008 -0700 |
| tree | c08e68a41b055bf9d7823ffd6f8843b72098f020 | |
| parent | bdec6cace4c3ecb6f90bcaa5424b92c97bd1df0f [diff] | |
| parent | 2567d71cc7acd99f0a0dd02e17fe17fd7df7b30c [diff] |
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: fix asm/e820.h for userspace inclusion x86: fix numaq_tsc_disable x86: fix kernel_physical_mapping_init() for large x86 systems