Linus Torvalds
cebfa85eb8
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus ...
Pull MIPS updates from Ralf Baechle:
"The MIPS bits for 3.8. This also includes a bunch fixes that were
sitting in the linux-mips.org git tree for a long time. This pull
request contains updates to several OCTEON drivers and the board
support code for BCM47XX, BCM63XX, XLP, XLR, XLS, lantiq, Loongson1B,
updates to the SSB bus support, MIPS kexec code and adds support for
kdump.
When pulling this, there are two expected merge conflicts in
include/linux/bcma/bcma_driver_chipcommon.h which are trivial to
resolve, just remove the conflict markers and keep both alternatives."
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (90 commits)
MIPS: PMC-Sierra Yosemite: Remove support.
VIDEO: Newport Fix console crashes
MIPS: wrppmc: Fix build of PCI code.
MIPS: IP22/IP28: Fix build of EISA code.
MIPS: RB532: Fix build of prom code.
MIPS: PowerTV: Fix build.
MIPS: IP27: Correct fucked grammar in ops-bridge.c
MIPS: Highmem: Fix build error if CONFIG_DEBUG_HIGHMEM is disabled
MIPS: Fix potencial corruption
MIPS: Fix for warning from FPU emulation code
MIPS: Handle COP3 Unusable exception as COP1X for FP emulation
MIPS: Fix poweroff failure when HOTPLUG_CPU configured.
MIPS: MT: Fix build with CONFIG_UIDGID_STRICT_TYPE_CHECKS=y
MIPS: Remove unused smvp.h
MIPS/EDAC: Improve OCTEON EDAC support.
MIPS: OCTEON: Add definitions for OCTEON memory contoller registers.
MIPS: OCTEON: Add OCTEON family definitions to octeon-model.h
ata: pata_octeon_cf: Use correct byte order for DMA in when built little-endian.
MIPS/OCTEON/ata: Convert pata_octeon_cf.c to use device tree.
MIPS: Remove usage of CEVT_R4K_LIB config option.
...
2012-12-14 14:27:45 -08:00
EDAC: Fix csrow size reported in sysfs
2012-11-28 11:54:40 +01:00
amd64_edac: Use DBAM_DIMM macro
2012-11-28 11:46:19 +01:00
amd64_edac: convert sysfs logic to use struct device
2012-06-11 13:23:40 -03:00
amd64_edac: Improve error injection
2012-11-28 11:45:01 +01:00
edac: edac_mc_handle_error(): add an error_count parameter
2012-06-12 12:15:47 -03:00
edac: Drop __DATE__ usage
2011-04-19 00:23:22 +02:00
edac: AMD8111 driver header file
2009-04-02 19:05:03 -07:00
edac: Drop __DATE__ usage
2011-04-19 00:23:22 +02:00
tree-wide: fix comment/printk typos
2010-11-01 15:38:34 -04:00
edac: edac_mc_handle_error(): add an error_count parameter
2012-06-12 12:15:47 -03:00
edac: edac_mc_handle_error(): add an error_count parameter
2012-06-12 12:15:47 -03:00
edac: edac_mc_handle_error(): add an error_count parameter
2012-06-12 12:15:47 -03:00
edac: edac_mc_handle_error(): add an error_count parameter
2012-06-12 12:15:47 -03:00
Merge branch 'devel'
2012-07-29 21:11:05 -03:00
Merge branch 'devel'
2012-07-29 21:11:05 -03:00
edac: Convert debugfX to edac_dbg(X,
2012-06-11 13:23:49 -03:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
2012-12-11 11:28:43 -08:00
EDAC: Handle error path in edac_mc_sysfs_init() properly
2012-11-28 11:56:52 +01:00
EDAC: Boundary-check edac_debug_level
2012-11-28 11:23:32 +01:00
edac: create top-level debugfs directory
2012-06-12 12:15:49 -03:00
EDAC: Respect operational state in edac_pci.c
2012-11-28 11:22:47 +01:00
EDAC, pci_sysfs: Use for_each_pci_dev to simplify the code
2012-12-04 08:27:39 +01:00
EDAC: Change Boris' email address
2012-10-30 10:05:51 +01:00
edac: add support for Calxeda highbank L2 cache ecc
2012-06-27 09:01:29 -03:00
EDAC, Calxeda highbank: Convert to use simple_open()
2012-11-28 11:55:07 +01:00
i7core_edac: fix panic when accessing sysfs files
2012-11-28 06:56:00 -02:00
edac: edac_mc_handle_error(): add an error_count parameter
2012-06-12 12:15:47 -03:00
i3200_edac: Fix memory rank size
2012-09-25 07:32:33 -03:00
i5000: Fix the memory size calculation with 2R memories
2012-09-25 07:38:19 -03:00
edac: edac_mc_handle_error(): add an error_count parameter
2012-06-12 12:15:47 -03:00
edac i5000, i5400: fix pointer math in i5000_get_mc_regs()
2012-06-27 09:08:40 -03:00
i7300_edac: Fix error flag testing
2012-10-25 07:43:00 -02:00
edac: edac_mc_handle_error(): add an error_count parameter
2012-06-12 12:15:47 -03:00
edac: edac_mc_handle_error(): add an error_count parameter
2012-06-12 12:15:47 -03:00
edac: edac_mc_handle_error(): add an error_count parameter
2012-06-12 12:15:47 -03:00
i82975x_edac: Fix dimm label initialization
2012-10-25 07:17:01 -02:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-12-14 14:27:45 -08:00
MIPS: Cavium: Add EDAC support.
2012-12-12 16:48:49 +01:00
MCE, AMD: Dump error status
2012-11-28 11:56:30 +01:00
MCE, AMD: Dump error status
2012-11-28 11:56:30 +01:00
EDAC: Change Boris' email address
2012-10-30 10:05:51 +01:00
powerpc/fsl-pci: Unify pci/pcie initialization code
2012-09-12 14:57:12 -05:00
edac: Drop __DATE__ usage
2011-04-19 00:23:22 +02:00
edac: edac_mc_handle_error(): add an error_count parameter
2012-06-12 12:15:47 -03:00
edac: Drop __DATE__ usage
2011-04-19 00:23:22 +02:00
MIPS/EDAC: Improve OCTEON EDAC support.
2012-12-13 18:15:26 +01:00
MIPS/EDAC: Improve OCTEON EDAC support.
2012-12-13 18:15:26 +01:00
MIPS/EDAC: Improve OCTEON EDAC support.
2012-12-13 18:15:26 +01:00
MIPS/EDAC: Improve OCTEON EDAC support.
2012-12-13 18:15:26 +01:00
edac: edac_mc_handle_error(): add an error_count parameter
2012-06-12 12:15:47 -03:00
edac: edac_mc_handle_error(): add an error_count parameter
2012-06-12 12:15:47 -03:00
edac: new ppc4xx driver module
2009-04-02 19:05:03 -07:00
edac: edac_mc_handle_error(): add an error_count parameter
2012-06-12 12:15:47 -03:00
sb_edac: Avoid overflow errors at memory size calculation
2012-09-25 07:38:20 -03:00
edac: edac_mc_handle_error(): add an error_count parameter
2012-06-12 12:15:47 -03:00
edac: edac_mc_handle_error(): add an error_count parameter
2012-06-12 12:15:47 -03:00
cebfa85eb8