projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ca2a88f cd34ab8)
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 19 Dec 2012 20:56:42 +0000 (12:56 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 19 Dec 2012 20:56:42 +0000 (12:56 -0800)
commit3dbff0d5e8ec9e6d0834ea889d496bc724743dfd
tree30af8010ac1d9e0478831e0e0334dc7e12db8a8dtree | snapshot (tar.gz zip)
parentca2a88f56aa385890c7fd4ce9d2722b0848ca990commit | diff
parentcd34ab8b16ffaa9753d85adb4fb6cd98e7e1d22acommit | diff
Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull small x86 fixes from Peter Anvin:
 "A collection of very small fixes, mostly pure documentation."

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, doc: Document that bootloader ID 4 is used also by iPXE
  x86, doc: Add a formal bootloader ID for kexec-tools
  x86, 8042: Enable A20 using KBC to fix S3 resume on some MSI laptops
Documentation/x86/boot.txt diff1 | diff2 | blob | history