summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux...Linus Torvalds2012-05-3056-610/+767
|\
| * x86, realmode: Move end signature into header.SH. Peter Anvin2012-05-214-6/+15
| * x86, relocs: When printing an error, say relative or absoluteH. Peter Anvin2012-05-181-3/+8
| * x86, relocs: More relocations which may end up as absoluteH. Peter Anvin2012-05-181-1/+5
| * x86, relocs: Workaround for binutils 2.22.52.0.1 section bugH. Peter Anvin2012-05-181-1/+1
| * x86, realmode: Change EFER to a single u64 fieldH. Peter Anvin2012-05-163-7/+5Star
| * x86, realmode: Move kernel/realmode.c to realmode/init.cH. Peter Anvin2012-05-163-1/+1
| * x86, realmode: Move not-common bits out of trampoline_common.SH. Peter Anvin2012-05-163-35/+33Star
| * x86, realmode: Mask out EFER.LMA when saving trampoline EFERH. Peter Anvin2012-05-161-3/+8
| * x86, realmode: Fix no cache bits test in reboot_32.SJarkko Sakkinen2012-05-111-1/+1
| * x86, realmode: Make sure all generated files are listed in targetsH. Peter Anvin2012-05-091-7/+13
| * x86, realmode: build fix: remove duplicate buildJarkko Sakkinen2012-05-092-5/+2Star
| * x86, realmode: read cr4 and EFER from kernel for 64-bit trampolineJarkko Sakkinen2012-05-097-28/+49
| * x86, realmode: fixes compilation issue in tboot.cJarkko Sakkinen2012-05-091-1/+1
| * x86, realmode: move relocs from scripts/ to arch/x86/toolsJarkko Sakkinen2012-05-096-3/+815
| * x86, realmode: header for trampoline codeJarkko Sakkinen2012-05-088-88/+87Star
| * x86, realmode: flattened rm hierachyJarkko Sakkinen2012-05-0821-52/+22Star
| * x86, realmode: don't copy real_mode_headerJarkko Sakkinen2012-05-089-42/+34Star
| * x86, realmode: fix 64-bit wakeup sequenceJarkko Sakkinen2012-05-089-107/+110
| * x86, realmode: Fix always-zero test in reboot_32.SH. Peter Anvin2012-05-081-1/+1
| * x86, realmode: Move trampoline_*.S early in the link orderH. Peter Anvin2012-05-081-1/+1
| * x86, realmode: Replace open-coded ljmpw with a macroH. Peter Anvin2012-05-085-16/+25
| * x86, realmode: Remove indirect jumps in trampoline_32 and wakeup_asmH. Peter Anvin2012-05-082-12/+18
| * x86, realmode: Remove indirect jumps in trampoline_64.SH. Peter Anvin2012-05-081-13/+2Star
| * x86, realmode: Align .data section in trampoline_32.SH. Peter Anvin2012-05-081-1/+1
| * x86, realmode: Move bits to the proper sections in trampoline_64.SH. Peter Anvin2012-05-081-4/+6
| * x86, realmode: Add .text64 section, make barrier symbols absoluteH. Peter Anvin2012-05-081-3/+8
| * x86, realmode: Set permission for real mode pagesJarkko Sakkinen2012-05-081-1/+15
| * x86, realmode: Move ACPI wakeup to unified realmode codeJarkko Sakkinen2012-05-0834-562/+106Star
| * x86, realmode: Move SMP trampoline to unified realmode codeJarkko Sakkinen2012-05-089-16/+316
| * x86, realmode: Move reboot_32.S to unified realmode codeJarkko Sakkinen2012-05-086-65/+52Star
| * x86, realmode: Relocator for realmode codeJarkko Sakkinen2012-05-084-0/+108
| * x86, realmode: realmode.bin infrastructureJarkko Sakkinen2012-05-087-1/+189
| * x86, realmode: 16-bit real-mode code support for relocs toolH. Peter Anvin2012-05-082-684/+5Star
* | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2012-05-30118-3630/+3835
|\ \
| | \
| | \
| | \
| | \
| | \
| | \
| | \
| | \
| *-------. \ Merge branches 'fixes-for-linus', 'generic', 'cavium', 'module.h-fixes', 'nex...Ralf Baechle2012-05-26114-2260/+3822
| |\ \ \ \ \ \
| | | | | | * | MIPS: lantiq: remove orphaned codeJohn Crispin2012-05-266-175/+7Star
| | | | | | * | MIPS: lantiq: implement support for FALCON socJohn Crispin2012-05-2110-0/+552
| | | | | | * | watchdog: MIPS: lantiq: implement OF support and minor fixesJohn Crispin2012-05-212-1/+2
| | | | | | * | GPIO: MIPS: lantiq: move gpio-stp and gpio-ebu to the subsystem folderJohn Crispin2012-05-213-279/+1Star
| | | | | | * | MIPS: pci: convert lantiq driver to OFJohn Crispin2012-05-214-94/+131
| | | | | | * | MIPS: lantiq: convert dma to platform driverJohn Crispin2012-05-211-22/+39
| | | | | | * | MIPS: lantiq: implement support for clkdev apiJohn Crispin2012-05-2112-479/+681
| | | | | | * | MIPS: lantiq: drop ltq_gpio_request() and gpio_to_irq()John Crispin2012-05-215-62/+17Star
| | | | | | * | OF: MIPS: lantiq: implement irq_domain supportJohn Crispin2012-05-211-76/+102
| | | | | | * | OF: MIPS: lantiq: implement OF supportJohn Crispin2012-05-2111-77/+294
| | | | | | * | MIPS: lantiq: drop mips_machine supportJohn Crispin2012-05-2116-529/+4Star
| | | | | | * | MIPS: lantiq: cleanup reset codeJohn Crispin2012-05-153-13/+48
| | | | | | * | MIPS: lantiq: add xway soc idsJohn Crispin2012-05-156-102/+144
| | | | | | * | MIPS: lantiq: fix cmdline parsingThomas Langer2012-05-151-2/+4