| commit | 73d5a8675f32b8e22e11773b314324316f920192 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Mar 22 10:41:36 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Mar 22 10:41:36 2011 -0700 |
| tree | d353161d8d162afd6fa90267c96a902a0a9e85be | |
| parent | e77277dfe28baed73b6fd7c66c3fb44580a3dac1 [diff] | |
| parent | d8aa5ec3382e6a545b8f25178d1e0992d4927f19 [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: xen: update mask_rw_pte after kernel page tables init changes xen: set max_pfn_mapped to the last pfn mapped x86: Cleanup highmap after brk is concluded Fix up trivial onflict (added header file includes) in arch/x86/mm/init_64.c