diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-04 09:10:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-04 09:10:27 -0700 |
| commit | 9cb87aaf404110822200ca1e508471f8f083d1de (patch) | |
| tree | 507a6b3d6118369afd871a2d17092069a62be123 /arch/x86/boot | |
| parent | 2a475501b81f06f64c474cfad66f8807294b4534 (diff) | |
| parent | 5b8fafcac6242bf914334d3ae9dbe921ad8d4634 (diff) | |
| parent | 062fe8fe511e7f771ef1dc824eaf996ba50a694b (diff) | |
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()