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

Browse source

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
  x86-boot: don't request VBE2 information
  x86: re-add reboot fixups
  x86: fix typo in step.c
  x86: fix merge mistake in i387.c
  x86: clear DF before calling signal handler

...

This commit is contained in:

Linus Torvalds 2008-03-07 10:05:57 -08:00

parent 80d38f9a78 1722770f13

commit 0a9e070349

8 changed files with 15 additions and 18 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

9

arch/x86/boot/vesa.h

View file

2

arch/x86/boot/video-vesa.c

View file

4

arch/x86/ia32/ia32_signal.c

View file

2

arch/x86/kernel/i387.c

View file

6

arch/x86/kernel/reboot.c

View file

4

arch/x86/kernel/signal_32.c

View file

2

arch/x86/kernel/signal_64.c

View file

4

arch/x86/kernel/step.c

View file