summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux...Linus Torvalds2012-05-293-3/+7
|\
| * 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: don't copy real_mode_headerJarkko Sakkinen2012-05-081-1/+1
| * x86, realmode: Move ACPI wakeup to unified realmode codeJarkko Sakkinen2012-05-081-3/+5
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edacLinus Torvalds2012-05-2931-1446/+1821
|\ \
| * | 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
| * | i5000_edac: Fix the logic that retrieves memory informationMauro Carvalho Chehab2012-05-281-71/+79
| * | i5400_edac: improve debug messages to better represent the filled memoryMauro Carvalho Chehab2012-05-281-1/+14
| * | edac: Cleanup the logs for i7core and sb edac driversMauro Carvalho Chehab2012-05-282-31/+20
| * | edac: Initialize the dimm label with the known informationMauro Carvalho Chehab2012-05-282-10/+26
| * | edac: Remove the legacy EDAC ABIMauro Carvalho Chehab2012-05-2827-151/+32
| * | x38_edac: convert driver to use the new edac ABIMauro Carvalho Chehab2012-05-281-7/+21
| * | tile_edac: convert driver to use the new edac ABIMauro Carvalho Chehab2012-05-281-3/+13
| * | sb_edac: convert driver to use the new edac ABIMauro Carvalho Chehab2012-05-281-103/+56
| * | r82600_edac: convert driver to use the new edac ABIMauro Carvalho Chehab2012-05-281-9/+18
| * | ppc4xx_edac: convert driver to use the new edac ABIMauro Carvalho Chehab2012-05-281-8/+17
| * | pasemi_edac: convert driver to use the new edac ABIMauro Carvalho Chehab2012-05-281-9/+16
| * | mv64x60_edac: convert driver to use the new edac ABIMauro Carvalho Chehab2012-05-281-6/+19
| * | mpc85xx_edac: convert driver to use the new edac ABIMauro Carvalho Chehab2012-05-281-5/+17
| * | i82975x_edac: convert driver to use the new edac ABIMauro Carvalho Chehab2012-05-281-7/+20
| * | i82875p_edac: convert driver to use the new edac ABIMauro Carvalho Chehab2012-05-281-8/+21
| * | i82860_edac: convert driver to use the new edac ABIMauro Carvalho Chehab2012-05-281-13/+29
| * | i82443bxgx_edac: convert driver to use the new edac ABIMauro Carvalho Chehab2012-05-281-10/+16
| * | i7core_edac: convert driver to use the new edac ABIMauro Carvalho Chehab2012-05-281-152/+50
| * | i7300_edac: convert driver to use the new edac ABIMauro Carvalho Chehab2012-05-281-48/+30
| * | i5400_edac: convert driver to use the new edac ABIMauro Carvalho Chehab2012-05-281-98/+119
| * | i5100_edac: convert driver to use the new edac ABIMauro Carvalho Chehab2012-05-281-50/+40
| * | i5000_edac: convert driver to use the new edac ABIMauro Carvalho Chehab2012-05-281-21/+39
| * | i3200_edac: convert driver to use the new edac ABIMauro Carvalho Chehab2012-05-281-10/+22
| * | i3000_edac: convert driver to use the new edac ABIMauro Carvalho Chehab2012-05-281-5/+20
| * | e7xxx_edac: convert driver to use the new edac ABIMauro Carvalho Chehab2012-05-281-7/+30
| * | e752x_edac: convert driver to use the new edac ABIMauro Carvalho Chehab2012-05-281-15/+34
| * | cpc925_edac: convert driver to use the new edac ABIMauro Carvalho Chehab2012-05-281-5/+18
| * | cell_edac: convert driver to use the new edac ABIMauro Carvalho Chehab2012-05-281-7/+19
| * | amd76x_edac: convert driver to use the new edac ABIMauro Carvalho Chehab2012-05-281-9/+19
| * | amd64_edac: convert driver to use the new edac ABIMauro Carvalho Chehab2012-05-281-45/+92
| * | edac: Change internal representation to work with layersMauro Carvalho Chehab2012-05-282-274/+527
| * | edac: rewrite edac_align_ptr()Mauro Carvalho Chehab2012-05-284-31/+48
| * | edac: move nr_pages to dimm structMauro Carvalho Chehab2012-05-2827-113/+141
| * | edac: Don't initialize csrow's first_page & friends when not neededMauro Carvalho Chehab2012-05-2812-78/+3
| * | edac: move dimm properties to struct dimm_infoMauro Carvalho Chehab2012-05-2827-249/+321
| * | edac: Create a dimm struct and move the labels into itMauro Carvalho Chehab2012-05-286-27/+49
* | | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2012-05-2911-109/+591
|\ \ \
| | \ \
| | \ \
| *-. \ \ Merge branches 'fixes-for-linus', 'generic', 'cavium', 'module.h-fixes', 'nex...Ralf Baechle2012-05-2611-109/+591
| |\ \ \ \
| | | * | | MTD: MIPS: lantiq: verify that the NOR interface is available on falcon socJohn Crispin2012-05-211-0/+7