From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 16 May 2016 23:27:53 +0000 (-0700)
Subject: Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.7-rc1~186
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=05e30f01b70e5f75f3c3a62010c0f059826da565;p=linux.git

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
---

05e30f01b70e5f75f3c3a62010c0f059826da565