summaryrefslogtreecommitdiffstats
path: root/arch/mips/cavium-octeon
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2012-10-094-195/+745
|\
| * Merge branch 'cn6xxx-mgmt' of git://git.linux-mips.org/pub/scm/daney/upstream...Ralf Baechle2012-09-272-31/+65
| |\
| | * MIPS: Octeon: Add octeon_io_clk_delay() function.David Daney2012-08-312-31/+65
| * | MIPS: OCTEON: Register ciu/ciu2 as the default irq_domain.David Daney2012-08-311-0/+2
| * | MIPS: Octeon: Make interrupt controller work with threaded handlers.David Daney2012-08-311-143/+137
| * | MIPS: OCTEON: Add support for cn68XX interrupt controller.David Daney2012-08-311-24/+544
| * | MIPS: OCTEON: Update register definitions.David Daney2012-08-311-1/+1
| |/
* | Merge 3.6-rc6 into tty-nextGreg Kroah-Hartman2012-09-161-46/+43
|\ \ | |/
| * MIPS: Octeon: Fix broken interrupt controller code.David Daney2012-08-171-46/+43
* | MIPS: OCTEON: Fix breakage due to 8250 changes.David Daney2012-08-141-15/+15
|/
*---. Merge branches 'next/generic', 'next/alchemy', 'next/bcm63xx', 'next/cavium',...Ralf Baechle2012-07-2511-773/+2160
|\ \ \
| | | * MIPS: Octeon: Use device tree to register serial ports.David Daney2012-07-232-85/+53
| | | * netdev: octeon_mgmt: Convert to use device tree.David Daney2012-07-232-64/+0
| | | * netdev: mdio-octeon.c: Convert to use device tree.David Daney2012-07-231-30/+0
| | | * i2c: Convert i2c-octeon.c to use device tree.David Daney2012-07-232-86/+0
| | | * MIPS: Octeon: Setup irq_domains for interrupts.David Daney2012-07-231-9/+206
| | | * MIPS: Octeon: Initialize and fixup device tree.David Daney2012-07-233-1/+570
| | | * MIPS: Octeon: Add device tree source files.David Daney2012-07-234-0/+1211
| | | * MIPS: OCTEON: Consolidate the edge and level irq_chip structures.David Daney2012-07-231-28/+2
| | | * MIPS: OCTEON: Remove unneeded OCTEON_IRQ_* defines.David Daney2012-07-231-43/+0
| | | * MIPS: Octeon: Add irq handlers for GPIO interrupts.David Daney2012-07-231-1/+110
| | | * MIPS: OCTEON: Remove some unused files.David Daney2012-07-232-426/+0
| |_|/ |/| |
| | * MIPS: OCTEON: Remove some unused files.David Daney2012-07-242-426/+0
| |/ |/|
| * MIPS: Octeon: Implement Octeon specific __copy_user_inatomicDavid Daney2012-07-231-4/+12
|/
* MIPS: Octeon: delay enable irq to ->smp_finish()Yong Zhang2012-07-191-1/+1
* MIPS: Cavium: Fix duplicate ARCH_SPARSEMEM_ENABLE in kconfig.Yoichi Yuasa2012-07-191-4/+0
*-. Merge branches 'fixes-for-linus', 'generic', 'cavium', 'module.h-fixes', 'nex...Ralf Baechle2012-05-262-6/+1
|\ \
| | * MIPS: Fix several implicit uses of export.h/module.hPaul Gortmaker2012-05-151-0/+1
| |/ |/|
| * MIPS: Cavium: Remove smp_reserve_lock.Ralf Baechle2012-05-171-6/+0
|/
* Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma...Linus Torvalds2012-04-041-6/+6
|\
| * MIPS: adapt for dma_map_ops changesAndrzej Pietrasiewicz2012-03-281-6/+6
* | Merge tag 'for-linus' of git://github.com/rustyrussell/linuxLinus Torvalds2012-04-021-2/+2
|\ \
| * | documentation: remove references to cpu_*_map.Rusty Russell2012-03-291-1/+1
| * | remove references to cpu_*_map in arch/Rusty Russell2012-03-291-1/+1
* | | Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6Linus Torvalds2012-03-301-1/+1
|\ \ \ | |/ / |/| |
| * | mtd: do not use plain 0 as NULLArtem Bityutskiy2012-03-271-1/+1
| |/
* | Disintegrate asm/system.h for MIPSDavid Howells2012-03-282-2/+1
|/
*---. Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/...Ralf Baechle2012-01-1120-41/+6625
|\ \ \
| | * | MIPS: Octeon: Update DMA mapping operations for OCTEON II processors.David Daney2011-12-071-2/+21
| | * | MIPS: Octeon: Rearrange CVMX files in preperation for device treeDavid Daney2011-12-074-24/+107
| | * | MIPS: Octeon: Update bootloader board type constants.David Daney2011-12-071-0/+20
| | * | MIPS: Octeon: Move some Ethernet support files out of staging.David Daney2011-12-0718-5/+6416
| | * | MIPS: Oceton: Update model detection code for new chips.David Daney2011-12-071-34/+85
| |/ /
* | | Merge branch 'next/generic' into mips-for-linux-nextRalf Baechle2012-01-111-8/+0
|\ \ \ | | |/ | |/|
| * | MIPS: Handle initmem in systems with kernel not in add_memory_region() memDavid Daney2011-12-071-8/+0
| |/
* | MIPS: Fix up inconsistency in panic() string argument.Ralf Baechle2011-12-072-4/+4
|/
* MIPS: Octeon: Fix compile error in arch/mips/cavium-octeon/flash_setup.cDavid Daney2011-11-101-7/+2
* MIPS: Octeon: Mark SMP-IPI interrupt as IRQF_NO_THREADVenkat Subbiah2011-11-081-2/+3
* mips: add export.h to files using EXPORT_SYMBOL/THIS_MODULEPaul Gortmaker2011-10-313-0/+3
* Merge git://git.infradead.org/mtd-2.6Linus Torvalds2011-05-271-10/+1
|\
OpenPOWER on IntegriCloud