From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 20 Feb 2013 03:12:03 +0000 (-0800)
Subject: Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~20737
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=121027a7a64a12e9e5c0289f12473ff11678a812;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull two x86 kernel build changes from Ingo Molnar:
 "The first change modifies how 'make oldconfig' works on cross-bitness
  situations on x86.  It was felt the new behavior of preserving the
  bitness of the .config is more logical.  This is a leftover of the
  merge.

  The second change eliminates a Perl warning.  (There's another, more
  complete fix resulting of this warning fix, which second fix in flight
  to you via the kbuild tree, which will remove the timeconst.pl script
  altogether.)"

* 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timeconst.pl: Eliminate Perl warning
  x86: Default to ARCH=x86 to avoid overriding CONFIG_64BIT
---

121027a7a64a12e9e5c0289f12473ff11678a812