]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
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)
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()


Trivial merge