Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-01 17:51:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
510fc4e11b
linux/arch/mips/cavium-octeon
History
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
..
executive MIPS: Octeon: Add kexec and kdump support 2012-12-13 17:00:39 +01:00
.gitignore MIPS: Octeon: Add device tree source files. 2012-07-23 13:54:52 +01:00
cpu.c MIPS: Octeon: Place cnmips_cu2_setup in __init memory. 2010-10-04 18:34:00 +01:00
csrc-octeon.c MIPS: Octeon: Add octeon_io_clk_delay() function. 2012-08-31 11:48:48 -07:00
dma-octeon.c MIPS: adapt for dma_map_ops changes 2012-03-28 16:36:32 +02:00
flash_setup.c mips/octeon: 16-Bit NOR flash was not being detected during boot 2012-11-09 11:37:16 +01:00
Kconfig MIPS: Cavium: Fix duplicate ARCH_SPARSEMEM_ENABLE in kconfig. 2012-07-19 11:23:43 +02:00
Makefile kbuild: centralize .dts->.dtb rule 2012-11-30 10:52:19 -06:00
octeon_3xxx.dts MIPS: Octeon: Add device tree source files. 2012-07-23 13:54:52 +01:00
octeon_68xx.dts MIPS: Octeon: Add device tree source files. 2012-07-23 13:54:52 +01:00
octeon_boot.h MIPS: Octeon: HOTPLUG_CPU fixes. 2010-08-05 13:26:12 +01:00
octeon-irq.c MIPS/OCTEON/ata: Convert pata_octeon_cf.c to use device tree. 2012-12-13 18:15:24 +01:00
octeon-memcpy.S MIPS: Octeon: Simplify code by assuming CONFIG_64BIT is always set. 2012-12-12 16:52:06 +01:00
octeon-platform.c MIPS/OCTEON/ata: Convert pata_octeon_cf.c to use device tree. 2012-12-13 18:15:24 +01:00
Platform MIPS: Octeon: Migrate to new platform makefile style. 2010-08-05 13:25:54 +01:00
serial.c MIPS: OCTEON: Fix breakage due to 8250 changes. 2012-08-14 14:54:31 -07:00
setup.c MIPS/EDAC: Improve OCTEON EDAC support. 2012-12-13 18:15:26 +01:00
smp.c MIPS: Octeon: delay enable irq to ->smp_finish() 2012-07-19 11:23:44 +02:00