Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Jun 2014 22:41:57 +0000 (15:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Jun 2014 22:41:57 +0000 (15:41 -0700)
commite7a38766d2e691e8030b77c9b46b19c9359e0d6c
tree5d67dfd93e3320846324ca2f47c5dc6e8b9eebb7
parent3d1a3bda65d2f48fead6f0727f2f392c15206852
parenta9a17104a112a67a7bf0679b734704c130eb5faa
Merge branch 'x86-boot-for-linus' of git://git./linux/kernel/git/tip/tip into next

Pull x86 boot changes from Ingo Molnar:
 "Two small cleanups"

* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, boot: Remove misc.h inclusion from compressed/string.c
  x86, boot: Do not include boot.h in string.c