| commit | f8245e91a5121acc435e509aa56cd04d445a74c7 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Oct 28 09:45:31 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Oct 28 09:45:31 2008 -0700 |
| tree | 2228dd5b184174ee2091be77f0b5b71640f74e5c | |
| parent | b30fc14c5c94728baa42b7c17d83ea17185b5c40 [diff] | |
| parent | 60817c9b31ef7897d60bca2f384cbc316a3fdd8b [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, memory hotplug: remove wrong -1 in calling init_memory_mapping() x86: keep the /proc/meminfo page count correct x86/uv: memory allocation at initialization xen: fix Xen domU boot with batched mprotect