summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* watchdog: create all the proper device filesAlan Cox2012-05-304-2/+42
* watchdog: Add a flag to indicate the watchdog doesn't reboot thingsAlan Cox2012-05-301-0/+2
* watchdog: Add multiple device supportAlan Cox2012-05-305-50/+140
* watchdog: watchdog_core.h: make functions externWim Van Sebroeck2012-05-301-2/+2
* watchdog: correct the name of the watchdog_core inlude fileWim Van Sebroeck2012-05-303-2/+2
* watchdog: Add watchdog_active() routineViresh Kumar2012-05-303-4/+10
* watchdog: watchdog_dev: include private header to pickup global symbol protot...H Hartley Sweeten2012-05-301-0/+2
* Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux...Linus Torvalds2012-05-2959-613/+774
|\
| * 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
| * xen-acpi-processor: Add missing #include <xen/xen.h>H. Peter Anvin2012-05-171-0/+1
| * acpi, bgrd: Add missing <linux/io.h> to drivers/acpi/bgrt.cH. Peter Anvin2012-05-171-0/+1
| * x86, realmode: Change EFER to a single u64 fieldH. Peter Anvin2012-05-163-7/+5
| * 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/+33
| * 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-101-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/+2
| * x86, realmode: read cr4 and EFER from kernel for 64-bit trampolineJarkko Sakkinen2012-05-087-28/+49
| * x86, realmode: fixes compilation issue in tboot.cJarkko Sakkinen2012-05-081-1/+1
| * x86, realmode: move relocs from scripts/ to arch/x86/toolsJarkko Sakkinen2012-05-088-7/+17
| * x86, realmode: header for trampoline codeJarkko Sakkinen2012-05-088-88/+87
| * x86, realmode: flattened rm hierachyJarkko Sakkinen2012-05-0821-52/+22
| * x86, realmode: don't copy real_mode_headerJarkko Sakkinen2012-05-0810-43/+35
| * 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/+2
| * 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: Allow absolute pa_* symbols in the realmode codeH. Peter Anvin2012-05-081-0/+7
| * x86, realmode: Set permission for real mode pagesJarkko Sakkinen2012-05-081-1/+15
| * x86, realmode: Move ACPI wakeup to unified realmode codeJarkko Sakkinen2012-05-0835-565/+111
| * 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/+52
| * 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-084-63/+185
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edacLinus Torvalds2012-05-2932-1468/+1981
|\ \
| * | i7core: fix ranks information at the per-channel structMauro Carvalho Chehab2012-05-281-13/+16
| * | i5000: Fix the fatal error handlingMauro Carvalho Chehab2012-05-281-7/+5
| * | i5100_edac: Fix a warning when compiled with 32 bitsMauro Carvalho Chehab2012-05-281-2/+2
| * | i82975x_edac: Test nr_pages earlier to save a few CPU cyclesMauro Carvalho Chehab2012-05-281-6/+3
| * | e752x_edac: provide more info about how DIMMS/ranks are mappedMauro Carvalho Chehab2012-05-281-4/+22
OpenPOWER on IntegriCloud