| commit | 3dbff0d5e8ec9e6d0834ea889d496bc724743dfd | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Dec 19 12:56:42 2012 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Dec 19 12:56:42 2012 -0800 |
| tree | 30af8010ac1d9e0478831e0e0334dc7e12db8a8d | |
| parent | ca2a88f56aa385890c7fd4ce9d2722b0848ca990 [diff] | |
| parent | cd34ab8b16ffaa9753d85adb4fb6cd98e7e1d22a [diff] |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/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