diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 17:10:02 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 17:10:02 (GMT) |
| commit | e7fd3b4669f5b835c8afce28425d9f698a558115 (patch) | |
| tree | d7f254a1d75807cc8b50f416ba3bd13010913ddc /arch/parisc | |
| parent | fc82e1d59a24cbac01c49d4eb3b28d6abc26a5f4 (diff) | |
| parent | 2ae9d293b14d17f35eff624272cfecac7979a2ee (diff) | |
| download | linux-e7fd3b4669f5b835c8afce28425d9f698a558115.tar.xz | |
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
Diffstat (limited to 'arch/parisc')
0 files changed, 0 insertions, 0 deletions