diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-04-22 11:12:19 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-04-22 11:13:53 +0300 |
| commit | b2eafe890d4a09bfa63ab31ff018d7d6bb8cfefc (patch) | |
| tree | 260890790538b5dffc49bc9ee607d808a6e47b98 /Documentation/blockdev | |
| parent | abfb9498ee1327f534df92a7ecaea81a85913bae (diff) | |
| parent | ea5dfb5fae81939f777ca569d8cfb599252da2e8 (diff) | |
| download | linux-b2eafe890d4a09bfa63ab31ff018d7d6bb8cfefc.tar.xz | |
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>
Diffstat (limited to 'Documentation/blockdev')
0 files changed, 0 insertions, 0 deletions