summaryrefslogtreecommitdiffstats
path: root/arch/mips
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dmaLinus Torvalds2013-07-077-345/+25
|\
| * MIPS: jz4740: Correct clock gate bit for DMA controllerMaarten ter Huurne2013-07-051-1/+1
| * MIPS: jz4740: Remove custom DMA APILars-Peter Clausen2013-07-053-364/+1
| * MIPS: jz4740: Register jz4740 DMA deviceLars-Peter Clausen2013-07-053-0/+23
| * MIPS: jz4740: Acquire and enable DMA controller clockMaarten ter Huurne2013-07-051-2/+22
* | Merge branch 'kconfig-diet' from Dave HansenLinus Torvalds2013-07-042-9/+1
|\ \
| * | consolidate per-arch stack overflow debugging optionsDave Hansen2013-07-042-9/+1
* | | Merge branch 'akpm' (updates from Andrew Morton)Linus Torvalds2013-07-034-82/+25
|\ \ \
| * | | mips: remove savemaxmem parameter setupZhang Yanfei2013-07-031-10/+0
| * | | mm/MIPS: prepare for killing free_all_bootmem_node()Jiang Liu2013-07-031-11/+1
| * | | mm/MIPS: prepare for removing num_physpages and simplify mem_init()Jiang Liu2013-07-033-59/+21
| * | | mm: concentrate modification of totalram_pages into the mm coreJiang Liu2013-07-032-2/+2
| * | | mm: change signature of free_reserved_area() to fix building warningsJiang Liu2013-07-031-1/+2
* | | | Merge tag 'pm+acpi-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2013-07-031-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'pm-cpufreq-assorted' into pm-cpufreqRafael J. Wysocki2013-06-271-1/+2
| |\ \ \ | | |/ / | |/| |
| | * | cpufreq: rename index as driver_data in cpufreq_frequency_tableViresh Kumar2013-06-041-1/+2
* | | | Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2013-07-022-4/+5
|\ \ \ \
| * | | | Merge tag 'v3.10' into sched/coreIngo Molnar2013-07-0116-148/+485
| |\| | |
| * | | | sched: Rename sched.c as sched/core.c in comments and DocumentationViresh Kumar2013-06-192-4/+5
| | |/ / | |/| |
* | | | 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
| |/ / /
* | | | Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2013-07-021-1/+1
|\ \ \ \
| * \ \ \ Merge 3.10-rc6 into driver-core-nextGreg Kroah-Hartman2013-06-1716-148/+485
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Finally eradicate CONFIG_HOTPLUGStephen Rothwell2013-06-031-1/+1
| | |/ / | |/| |
* | | | Merge tag 'tty-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gre...Linus Torvalds2013-07-022-2/+6
|\ \ \ \
| * \ \ \ Merge 3.10-rc6 into tty-nextGreg Kroah-Hartman2013-06-175-78/+105
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge 3.10-rc5 into tty-nextGreg Kroah-Hartman2013-06-0813-141/+451
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge 3.10-rc3 into tty-nextGreg Kroah-Hartman2013-05-2748-452/+481
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | TTY:vt: convert remain take_over_console's users to do_take_over_consoleWang YanQing2013-05-202-2/+6
* | | | | consolidate io_remap_pfn_range definitionsAl Viro2013-06-291-3/+1
| |_|_|/ |/| | |
* | | | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2013-06-123-7/+12
|\ \ \ \
| * | | | MIPS: ftrace: Add missing CONFIG_DYNAMIC_FTRACEMarkos Chandras2013-06-101-0/+4
| * | | | MIPS: include: mmu_context.h: Replace VIRTUALIZATION with KVMMarkos Chandras2013-06-101-1/+1
| * | | | MIPS: Alchemy: fix wait functionManuel Lauss2013-06-101-6/+7
| | |_|/ | |/| |
* | | | Merge branch 'fixes' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds2013-06-112-71/+93
|\ \ \ \ | |/ / / |/| | |
| * | | mips/kvm: Use KVM_REG_MIPS and proper size indicators for *_ONE_REGDavid Daney2013-06-112-71/+93
* | | | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2013-06-089-39/+82
|\ \ \ \ | |/ / / |/| | |
| * | | MIPS: ralink: add missing SZ_1M multiplierJohn Crispin2013-06-061-1/+1
| * | | MIPS: Compat: Fix cputime_to_timeval() arguments in compat binfmt_elf.Ralf Baechle2013-06-062-0/+22
| * | | MIPS: OCTEON: Improve _machine_halt implementation.David Daney2013-06-061-6/+9
| * | | MIPS: rtlx: Fix implicit declaration of function set_vi_handler()Yoichi Yuasa2013-06-061-0/+1
| * | | MIPS: Trap exception handling fixesMaciej W. Rozycki2013-05-231-13/+15
| * | | MIPS: Quit exposing Kconfig symbols in uapi headers.David Daney2013-05-232-15/+34
| * | | MIPS: Remove duplicate definition of check_for_high_segbits.David Daney2013-05-231-4/+0
* | | | mips/kvm: Use ENOIOCTLCMD to indicate unimplemented ioctls.David Daney2013-06-031-9/+9
* | | | mips/kvm: Fix ABI by moving manipulation of CP0 registers to KVM_{G,S}ET_ONE_REGDavid Daney2013-06-034-75/+322
* | | | mips/kvm: Use ARRAY_SIZE() instead of hardcoded constants in kvm_arch_vcpu_io...David Daney2013-06-031-3/+3
* | | | mips/kvm: Fix name of gpr field in struct kvm_regs.David Daney2013-06-032-3/+4
* | | | mips/kvm: Fix ABI for use of 64-bit registers.David Daney2013-06-031-5/+11
* | | | mips/kvm: Fix ABI for use of FPU.David Daney2013-06-031-8/+21
| |_|/ |/| |