aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/cavium-octeon
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2013-07-191-2/+3
|\
| * MIPS: Octeon: Fix DT pruning bug with pip portsFaidon Liambotis2013-07-191-2/+3
* | MIPS: Delete __cpuinit/__CPUINIT usage from MIPS codePaul Gortmaker2013-07-142-9/+9
|/
* Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2013-07-137-157/+36
|\
| * Merge branch '3.10-fixes' into mips-for-linux-nextRalf Baechle2013-07-122-3/+5
| |\
| | * MIPS: Octeon: Don't clobber bootloader data structures.David Daney2013-06-211-1/+1
| | * MIPS: Octeon: Fix build error if CONFIG_MTD=nRalf Baechle2013-06-201-1/+2
| | * MIPS: Oceton: Fix build error.Ralf Baechle2013-06-181-1/+2
| * | MIPS: Octeon: Enable interfaces on EdgeRouter LiteAaro Koskinen2013-07-011-0/+13
| * | MIPS: OCTEON: Remove custom serial setup code.David Daney2013-07-012-110/+1
| * | MIPS: OCTEON: Set proper UART clock in internal device trees.David Daney2013-07-011-1/+8
| * | MIPS: OCTEON: Get rid of CONFIG_CAVIUM_OCTEON_HW_FIX_UNALIGNEDDavid Daney2013-06-101-11/+0
| * | MIPS: Octeon: Remove vestiges of CONFIG_CAVIUM_DECODE_RSLDavid Daney2013-06-101-27/+0
| * | MIPS: OCTEON: Rename Kconfig CAVIUM_OCTEON_REFERENCE_BOARD to CAVIUM_OCTEON_SOCDavid Daney2013-06-102-5/+9
| |/
* | Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2013-07-021-1/+1
|\ \ | |/ |/|
| * MIPS: octeon: Use irq_get_trigger_type() to get IRQ flagsJavier Martinez Canillas2013-06-251-1/+1
* | MIPS: OCTEON: Improve _machine_halt implementation.David Daney2013-06-061-6/+9
|/
* MIPS: octeon: Fix GPIO number in IRQ chip private dataAlexander Sverdlin2013-05-081-3/+2
* MIPS: Fix build error cavium-octeon without CONFIG_SMPEunBong Song2013-04-051-1/+4
* Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2013-03-0225-220/+436
|\
| * MIPS: Octeon: Adding driver to measure interrupt latency on Octeon.Venkat Subbiah2013-02-153-0/+216
| * MIPS: Whitespace cleanup.Ralf Baechle2013-02-0123-220/+220
* | Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2013-02-211-1/+2
|\ \
| * | x86: Don't panic if can not alloc buffer for swiotlbYinghai Lu2013-01-291-1/+2
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2013-02-211-2/+2
|\ \ \ | |_|/ |/| |
| * | Merge branch 'master' into for-nextJiri Kosina2013-01-299-153/+365
| |\ \ | | |/
| * | treewide: Replace incomming with incoming in all comments and stringsJorrit Schippers2013-01-031-2/+2
* | | MIPS: Octeon: Fix warning.Ralf Baechle2013-01-221-4/+5
| |/ |/|
* | MIPS: drivers: remove __dev* attributes.Greg Kroah-Hartman2013-01-031-1/+1
* | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2012-12-146-149/+363
|\ \
| * \ Merge branch 'mips-next' of http://dev.phrozen.org/githttp/mips-next into mip...Ralf Baechle2012-12-131-1/+2
| |\ \
| | * | mips/octeon: 16-Bit NOR flash was not being detected during bootCharles Hardin2012-11-091-1/+2
| | |/
| * | MIPS/EDAC: Improve OCTEON EDAC support.David Daney2012-12-131-4/+26
| * | MIPS/OCTEON/ata: Convert pata_octeon_cf.c to use device tree.David Daney2012-12-132-103/+0
| * | MIPS: Octeon: Add kexec and kdump supportRalf Baechle2012-12-132-7/+310
| * | MIPS: Octeon: Simplify code by assuming CONFIG_64BIT is always set.Ralf Baechle2012-12-122-33/+0
| * | MIPS: Octeon: Remove use of CONFIG_64BIT_PHYS_ADDR.Ralf Baechle2012-12-121-1/+1
| * | MIPS: Octeon: Remove highmem code.Ralf Baechle2012-12-121-4/+0
| * | MIPS: Cavium: Add EDAC support.Ralf Baechle2012-12-121-1/+29
* | | Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2012-12-111-3/+0
|\ \ \ | |/ / |/| |
| * | kbuild: centralize .dts->.dtb ruleStephen Warren2012-11-301-3/+0
| |/
* | MIPS: Remove irqflags.h dependency from bitops.hJim Quinlan2012-11-091-0/+1
|/
* 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
|\ \ | |/