]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0019fab 6e87f9b)
Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Dec 2012 03:55:58 +0000 (19:55 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Dec 2012 03:55:58 +0000 (19:55 -0800)
commit507447473756e316f3f182324071389a51736a83
tree39afec5235c3309179ee4da23866f20604a3d1e2tree | snapshot
parent0019fab3558c8c8135c88c3d38f24ab0a5408aa6commit | diff
parent6e87f9b7e48e165cb8e6092b9abe682e7065614acommit | diff
Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 boot changes from Ingo Molnar:
 "Two small changes: a cleanup and allow CONFIG_X86_MPPARSE to be turned
  off on SFI as well."

* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  arch/x86/Kconfig: Allow turning off CONFIG_X86_MPPARSE when either ACPI or SFI is present
  x86/boot/doc: Fix grammar and typo in boot.txt
arch/x86/Kconfig diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules