aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-12-19 12:56:42 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-19 12:56:42 -0800
commit3dbff0d5e8ec9e6d0834ea889d496bc724743dfd (patch)
tree30af8010ac1d9e0478831e0e0334dc7e12db8a8d /scripts
parentMerge tag 'for-linus-20121219' of git://git.infradead.org/linux-mtd (diff)
parentx86, doc: Document that bootloader ID 4 is used also by iPXE (diff)
downloadlinux-dev-3dbff0d5e8ec9e6d0834ea889d496bc724743dfd.tar.xz
linux-dev-3dbff0d5e8ec9e6d0834ea889d496bc724743dfd.zip
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
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions