From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 4 Sep 2013 16:10:27 +0000 (-0700)
Subject: Merge branches 'x86-boot-for-linus' and 'x86-cleanups-for-linus' of git://git.kernel... 
X-Git-Tag: v3.12-rc1~162
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=9cb87aaf404110822200ca1e508471f8f083d1de;p=~andy%2Flinux

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()
---

9cb87aaf404110822200ca1e508471f8f083d1de