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

Browse source

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Provide _sdata in the vmlinux.lds.S file
  x86: handle initrd that extends into unusable memory

...

This commit is contained in:

Linus Torvalds 2009-06-12 09:26:32 -07:00

parent 8ebf975608 1260866a27

commit db8e7f10ed

2 changed files with 5 additions and 12 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

15

arch/x86/kernel/setup.c

View file

2

arch/x86/kernel/vmlinux.lds.S

View file