projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: abfb949 ea5dfb5)
Merge branch 'x86/urgent' into x86/asm, to fix semantic conflict
authorIngo Molnar <mingo@kernel.org>
Fri, 22 Apr 2016 08:12:19 +0000 (10:12 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 22 Apr 2016 08:13:53 +0000 (10:13 +0200)
commitb2eafe890d4a09bfa63ab31ff018d7d6bb8cfefc
tree260890790538b5dffc49bc9ee607d808a6e47b98tree | snapshot
parentabfb9498ee1327f534df92a7ecaea81a85913baecommit | diff
parentea5dfb5fae81939f777ca569d8cfb599252da2e8commit | diff
Merge branch 'x86/urgent' into x86/asm, to fix semantic conflict

'cpu_has_pse' has changed to boot_cpu_has(X86_FEATURE_PSE), fix this
up in the merge commit when merging the x86/urgent tree that includes
the following commit:

  103f6112f253 ("x86/mm/xen: Suppress hugetlbfs in PV guests")

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/include/asm/hugetlb.h diff1 | diff2 | blob | history
John Crispins staging tree