git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit

Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 cleanups from Ingo Molnar:
"Misc cleanups"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/apm: Fix spelling mistake: "caculate" -> "calculate"
  x86/mtrr: Rename main.c to mtrr.c and remove duplicate prefixes
  x86: Remove pr_fmt duplicate logging prefixes
  x86/early-quirks: Rename duplicate define of dev_err
  x86/bpf: Clean up non-standard comments, to make the code more readable

author	Linus Torvalds <torvalds@linux-foundation.org>
	Tue, 5 Jun 2018 02:17:47 +0000 (19:17 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Tue, 5 Jun 2018 02:17:47 +0000 (19:17 -0700)
commit	0afe832e55a70f4bc5e725db400779b4f620290c
tree	a656975173d7ed2cc65ef3cf38c16be48c81b85a	tree
parent	42964c6f6261f6b44bb43cabc93ac9e39b5a9a54	commit \| diff
parent	844ea8f62619ac2a5e47d13e3449ac197067b414	commit \| diff

arch/x86/kernel/apm_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/mtrr/mtrr.c	\|	diff2 \|	blob \| history
arch/x86/kernel/uprobes.c	diff1 \|	diff2 \|	blob \| history
arch/x86/net/bpf_jit_comp.c	diff1 \|	diff2 \|	blob \| history