Hi Ralf,
A few changes for you (hopefully for 3.8)
The following changes since commit 4d72c9c50c5db19e16afa7b769ad276dfc5bc93c:
Merge branch 'current/for-linus' into mips-for-linux-next (2012-11-15
15:20:33 +0100)
are available in the git repository at:
git://git.linux-mips.org/pub/scm/daney/upstream-daney.git octeon-for-next
for you to fetch changes up to d8b7a52d37e06e45b5e920216d5bf45eb3f6adca:
MIPS/EDAC: Improve OCTEON EDAC support. (2012-11-15 13:58:59 -0800)
----------------------------------------------------------------
David Daney (6):
MIPS: OCTEON: Remove garbage left from bad merge.
MIPS/OCTEON/ata: Convert pata_octeon_cf.c to use device tree.
ata: pata_octeon_cf: Use correct byte order for DMA in when built
little-endian.
MIPS: OCTEON: Add OCTEON family defintions to octeon-model.h
MIPS: OCTEON: Add definitions for OCTEON memory contoller registers.
MIPS/EDAC: Improve OCTEON EDAC support.
arch/mips/cavium-octeon/octeon-irq.c | 1 -
arch/mips/cavium-octeon/octeon-platform.c | 102 -
arch/mips/cavium-octeon/setup.c | 43 +-
arch/mips/include/asm/mach-cavium-octeon/irq.h | 1 -
arch/mips/include/asm/octeon/cvmx-lmcx-defs.h | 3457
++++++++++++++++++++++++
arch/mips/include/asm/octeon/octeon-model.h | 6 +
arch/mips/include/asm/octeon/octeon.h | 7 -
arch/mips/mm/c-octeon.c | 39 +-
arch/mips/pci/pci-octeon.c | 3 +-
drivers/ata/pata_octeon_cf.c | 423 ++-
drivers/edac/octeon_edac-l2c.c | 178 +-
drivers/edac/octeon_edac-lmc.c | 232 +-
drivers/edac/octeon_edac-lmc.h | 78 -
drivers/edac/octeon_edac-pc.c | 137 +-
drivers/edac/octeon_edac-pci.c | 44 +-
15 files changed, 4157 insertions(+), 594 deletions(-)
create mode 100644 arch/mips/include/asm/octeon/cvmx-lmcx-defs.h
delete mode 100644 drivers/edac/octeon_edac-lmc.h
