Merge branches 'x86-boot-for-linus' and 'x86-cleanups-for-linus' of git://git.kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Sep 2013 16:10:27 +0000 (09:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Sep 2013 16:10:27 +0000 (09:10 -0700)
commit9cb87aaf404110822200ca1e508471f8f083d1de
tree507a6b3d6118369afd871a2d17092069a62be123
parent2a475501b81f06f64c474cfad66f8807294b4534
parent5b8fafcac6242bf914334d3ae9dbe921ad8d4634
parent062fe8fe511e7f771ef1dc824eaf996ba50a694b
Merge branches 'x86-boot-for-linus' and 'x86-cleanups-for-linus' of git://git./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()