git.baikalelectronics.ru Git - kernel.git/commit

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

* 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Fix binutils-2.21 symbol related build failures
  x86-64, trampoline: Remove unused variable
  x86, reboot: Fix the use of passed arguments in 32-bit BIOS reboot
  x86, reboot: Move the real-mode reboot code to an assembly file
  x86: Make the GDT_ENTRY() macro in <asm/segment.h> safe for assembly
  x86, trampoline: Use the unified trampoline setup for ACPI wakeup
  x86, trampoline: Common infrastructure for low memory trampolines

Fix up trivial conflicts in arch/x86/kernel/Makefile

author	Linus Torvalds <torvalds@linux-foundation.org>
	Wed, 16 Mar 2011 17:10:02 +0000 (10:10 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Wed, 16 Mar 2011 17:10:02 +0000 (10:10 -0700)
commit	e55294022bb6fb06a542b31562ffe376d597bdd0
tree	d7f254a1d75807cc8b50f416ba3bd13010913ddc	tree \| snapshot
parent	ef3d1bc7eab34bcba1fa88af874a289d829ddaec	commit \| diff
parent	5c76f749ffe6bb390ba042fd306f2f9d8d1604b5	commit \| diff

arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/acpi.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apm_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/entry_32.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/reboot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smpboot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/vmlinux.lds.S	diff1 \|	diff2 \|	blob \| history
drivers/acpi/sleep.c	diff1 \|	diff2 \|	blob \| history