diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-19 19:12:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-19 19:12:03 -0800 |
| commit | 121027a7a64a12e9e5c0289f12473ff11678a812 (patch) | |
| tree | 741dd57ee06d9607d9126a7ae9014cd087e54d32 /arch/x86/um/fault.c | |
| parent | 5abcd76f5d896de014bd8d1486107c483659d40d (diff) | |
| parent | 63a3f603413ffe82ad775f2d62a5afff87fd94a0 (diff) | |
Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'arch/x86/um/fault.c')
0 files changed, 0 insertions, 0 deletions