Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Browse source

Pull x86 boot changes from Ingo Molnar:
 "A number of cleanups"

* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/boot: Standardize strcmp()
  x86/boot/64: Remove pointless early_printk() message
  x86/boot/video: Move the 'video_segment' variable to video.c

...

This commit is contained in:

Linus Torvalds 2015-04-13 13:19:10 -07:00

parent 60f898eeaa 1c1d046be6

commit 8f74bc5ff0

5 changed files with 4 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/x86/boot/string.c

View file

4

arch/x86/boot/video-mode.c

View file

2

arch/x86/boot/video.c

View file

1

arch/x86/boot/video.h

View file

3

arch/x86/kernel/head64.c

View file