]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fe7dc3e 8abdb6c)
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Mar 2011 17:41:36 +0000 (10:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Mar 2011 17:41:36 +0000 (10:41 -0700)
commita03eaeb6a01b768de7ac7aa0ee63fe0fbc4c9e5f
treed353161d8d162afd6fa90267c96a902a0a9e85betree | snapshot
parentfe7dc3efffd82f5cdd781bb81a2184cc949dec2ecommit | diff
parent8abdb6c30ac66bfe486efa333511cd2e8c7d35f6commit | 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
arch/x86/kernel/setup.c diff1 | diff2 | blob | history
arch/x86/mm/init_64.c diff1 | diff2 | blob | history
arch/x86/xen/mmu.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.