tree 1beddde372fe6accfa2305afc8a92587cbae5ef5
parent 9a45f036af363aec1efec08827c825d69c115a9a
parent 7a09b225f31031f8cac9e7801b6004e79f8b0da1
author Linus Torvalds <torvalds@linux-foundation.org> 1463441273 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1463441273 -0700

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

Pull x86-64 defconfig update from Ingo Molnar:
 "Small defconfig addition"

[ I'm not actually convinced our defconfig is sensible, but whatever ]

* 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/build/defconfig/64: Enable CONFIG_E1000E=y