tree b06fd6ecd600840fe28fd57a7ee054e844a434e0
parent 518bacf5a569d111e256d58b9fbc8d7b80ec42ea
parent 523d0fb4f05dcefed59c6325acb54adc34ee4c2d
author Linus Torvalds <torvalds@linux-foundation.org> 1481583204 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1481583204 -0800

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

Pull x86 header fixlet from Ingo Molnar:
 "Remove unnecessary module.h inclusion from core code (Paul Gortmaker)"

* 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/percpu: Remove unnecessary include of module.h, add asm/desc.h