summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-22 18:41:36 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-22 18:41:36 +0100
commit73d5a8675f32b8e22e11773b314324316f920192 (patch)
treed353161d8d162afd6fa90267c96a902a0a9e85be /fs
parentMerge branch 'next-samsung' of git://git.fluff.org/bjdooks/linux (diff)
parentxen: update mask_rw_pte after kernel page tables init changes (diff)
downloadlinux-73d5a8675f32b8e22e11773b314324316f920192.tar.xz
linux-73d5a8675f32b8e22e11773b314324316f920192.zip
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
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions