diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 19:21:19 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 19:21:19 +0200 |
| commit | e7b30a17c1ef5cbc67c5381407d2d03484b8def3 (patch) | |
| tree | ac54eb1084609a1d8d910e563299b3d7a2587020 /arch/x86/Makefile | |
| parent | Merge branches 'x86-asm-for-linus', 'x86-cleanups-for-linus', 'x86-cpu-for-li... (diff) | |
| parent | x86, relocs: Build clean fix (diff) | |
| download | linux-e7b30a17c1ef5cbc67c5381407d2d03484b8def3.tar.xz linux-e7b30a17c1ef5cbc67c5381407d2d03484b8def3.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86/urgent branch from Ingo Molnar:
"These are the fixes left over from the very end of the v3.4
stabilization cycle, plus one more fix."
Ugh. Those KERN_CONT additions are just pointless. I think they came
as a reaction to some of the early (broken) printk() work - but that was
fixed before it was merged.
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, relocs: Build clean fix
x86, printk: Add missing KERN_CONT to NMI selftest
x86: Fix boot on Twinhead H12Y
Diffstat (limited to 'arch/x86/Makefile')
| -rw-r--r-- | arch/x86/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 277418ff8b52..dc611a40a336 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -205,6 +205,7 @@ archclean: $(Q)rm -rf $(objtree)/arch/i386 $(Q)rm -rf $(objtree)/arch/x86_64 $(Q)$(MAKE) $(clean)=$(boot) + $(Q)$(MAKE) $(clean)=arch/x86/tools define archhelp echo '* bzImage - Compressed kernel image (arch/x86/boot/bzImage)' |