git.stricted.de - GitHub/LineageOS/android_kernel_samsung_universal7580.git/commit

projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d886c73 3e0e1e9)

author	H. Peter Anvin <hpa@zytor.com>
	Thu, 27 Aug 2009 00:17:51 +0000 (17:17 -0700)
committer	H. Peter Anvin <hpa@zytor.com>
	Thu, 27 Aug 2009 00:24:28 +0000 (17:24 -0700)
commit	b855192c08fcb14adbc5d3a7cab182022d433cca
tree	3a10cafbfbf98cafacf667eb218c71300b351bfa	tree \| snapshot (tar.gz zip)
parent	d886c73cd4cf02a71e1650cbcb6176799d78aac1	commit \| diff
parent	3e0e1e9c5a327d4dba8490d83ef55c0564e6e8a7	commit \| diff

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 <hpa@zytor.com>

arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/amd.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/common.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/perfctr-watchdog.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/x86.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/ioremap.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/pat.c	diff1 \|	diff2 \|	blob \| history
kernel/smp.c	diff1 \|	diff2 \|	blob \| history