diff options
| author | H. Peter Anvin <[email protected]> | 2009-08-27 00:17:51 +0000 |
|---|---|---|
| committer | H. Peter Anvin <[email protected]> | 2009-08-27 00:24:28 +0000 |
| commit | b855192c08fcb14adbc5d3a7cab182022d433cca (patch) | |
| tree | 3a10cafbfbf98cafacf667eb218c71300b351bfa /fs/proc/array.c | |
| parent | x86, pat: Sanity check remap_pfn_range for RAM region (diff) | |
| parent | x86: Fix an incorrect argument of reserve_bootmem() (diff) | |
| download | kernel-b855192c08fcb14adbc5d3a7cab182022d433cca.tar.gz kernel-b855192c08fcb14adbc5d3a7cab182022d433cca.zip | |
Merge branch 'x86/urgent' into x86/pat
Reason: Change to is_new_memtype_allowed() in x86/urgent
Resolved semantic conflicts in:
arch/x86/mm/pat.c
arch/x86/mm/ioremap.c
Signed-off-by: H. Peter Anvin <[email protected]>
Diffstat (limited to 'fs/proc/array.c')
0 files changed, 0 insertions, 0 deletions