aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-09-04 09:10:27 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-04 09:10:27 -0700
commit9cb87aaf404110822200ca1e508471f8f083d1de (patch)
tree507a6b3d6118369afd871a2d17092069a62be123 /arch
parentMerge branch 'x86-asmlinkage-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff)
parentx86/boot: Fix a sanity check in printf.c (diff)
parentx86, boot: Fix warning due to undeclared strlen() (diff)
downloadlinux-dev-9cb87aaf404110822200ca1e508471f8f083d1de.tar.xz
linux-dev-9cb87aaf404110822200ca1e508471f8f083d1de.zip
Merge branches 'x86-boot-for-linus' and 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull tiny x86 boot cleanups from Ingo Molnar. * 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/boot: Fix a sanity check in printf.c * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, boot: Fix warning due to undeclared strlen()