summaryrefslogtreecommitdiff
path: root/arch/mips
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'usb-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbLinus Torvalds2012-03-201-6/+25
|\
| * USB: use generic platform driver on ath79Hauke Mehrtens2012-03-151-6/+25
* | Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2012-03-201-3/+1
|\ \
| * \ Merge tag 'v3.3-rc7' into sched/coreIngo Molnar2012-03-1314-36/+58
| |\ \ | | |/
| * | sched/rt: Use schedule_preempt_disabled()Thomas Gleixner2012-03-011-3/+1
* | | Merge branch 'perf/hw-branch-sampling' into perf/coreIngo Molnar2012-03-121-0/+4
|\ \ \
| * | | perf: Disable PERF_SAMPLE_BRANCH_* when not supportedStephane Eranian2012-03-051-0/+4
* | | | Merge branch 'perf/urgent' into perf/coreIngo Molnar2012-03-1214-36/+58
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | MIPS: traps.c: Fix typoMasanari Iida2012-02-201-1/+1
| * | MIPS: PowerTV: Fix defconfigs for coverage buildsRalf Baechle2012-02-201-1/+1
| * | MIPS: Netlogic: Fix defconfigs for coverage buildsPaul Gortmaker2012-02-202-4/+4
| * | MIPS: ATH79: Avoid a kernel bug on AR913XGabor Juhos2012-02-201-1/+1
| * | MIPS: PCI: use list_for_each_entry() for bus->devices traversalBjorn Helgaas2012-02-202-14/+1
| * | MIPS: fault.c: Port OOM changes to do_page_faultKautuk Consul2012-02-201-7/+29
| * | MIPS: vmlinux.lds.S: remove duplicate _sdata symbolTony Wu2012-02-201-1/+0
| * | MIPS: Alchemy: Increase minimum timeout for 32kHz timer.Manuel Lauss2012-02-201-1/+1
| * | MIPS: txx9 7segled fix struct device has no memberYoichi Yuasa2012-02-201-1/+1
| * | MIPS: Alchemy: Update Au1300 inlined GPIO macrosManuel Lauss2012-02-201-1/+19
| * | MIPS: Remove temporary kludge from <asm/page.h>Ralf Baechle2012-02-201-3/+0
| * | MIPS: BMIPS: smp-bmips.c does not need to include version.hJesper Juhl2012-02-201-1/+0
| |/
* | Merge branch 'perf/urgent' into perf/coreIngo Molnar2012-03-052-2/+3
|\ \ | |/
| * mips: use the the PCI controller's io_map_baseMichael S. Tsirkin2012-01-312-2/+3
* | static keys: Introduce 'struct static_key', static_key_true()/false() and sta...Ingo Molnar2012-02-241-1/+1
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2012-01-172-8/+17
|\
| * audit: inline audit_syscall_entry to reduce burden on archsEric Paris2012-01-171-4/+3
| * Audit: push audit success and retcode into arch ptrace.hEric Paris2012-01-172-4/+14
* | Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headersLinus Torvalds2012-01-142-4/+10
|\ \
| * | UAPI: Split trivial #if defined(__KERNEL__) && X conditionalsDavid Howells2011-12-131-3/+7
| * | UAPI: Fix arch/mips/include/asm/Kbuild to have separate header-y linesDavid Howells2011-12-121-1/+3
* | | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2012-01-14313-5966/+42528
|\ \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| *-----------------. \ \ Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/...Ralf Baechle2012-01-11174-1957/+36201
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * | | MIPS: Netlogic: Mark Netlogic chips as SMT capableHillf Danton2011-12-071-4/+7
| | | | | | | | | | | * | | MIPS: Netlogic: Add support for XLP 3XX coresJayachandran C2011-12-073-12/+21
| | | | | | | | | | | * | | MIPS: Netlogic: Merge some of XLR/XLP wakup codeJayachandran C2011-12-0713-230/+234
| | | | | | | | | | | * | | MIPS: Netlogic: Add default XLP config.Jayachandran C2011-12-071-0/+570
| | | | | | | | | | | * | | MIPS: Netlogic: Add XLP makefiles and configJayachandran C2011-12-077-0/+50
| | | | | | | | | | | * | | MIPS: Netlogic: Add XLP platform files for XLP SoCJayachandran C2011-12-0716-4/+1938
| | | | | | | | | | | * | | MIPS: Netlogic: XLP CPU support.Jayachandran C2011-12-075-8/+37
| | | | | | | | | | | * | | MIPS: Netlogic: Update default configJayachandran C2011-12-071-8/+8
| | | | | | | | | | | * | | MIPS: Netlogic: Move code common with XLP to common/Jayachandran C2011-12-0719-441/+698
| | | | | | | | | | | * | | MIPS: Netlogic: No need to set -Werror in mips/xlrJayachandran C2011-12-071-2/+0
| | | | | | | | | | | * | | MIPS: Netlogic: Use CPU_XLR instead of NLM_XLRJayachandran C2011-12-074-7/+3
| | | | | | | | | | | * | | MIPS: Netlogic: Style fixes for PlatformJayachandran C2011-12-071-5/+5
| | | | | | | | | | | * | | MIPS: Netlogic: Add basic MSI support for XLR/XLSGanesan Ramalingam2011-12-074-1/+140
| | | | | | | | | | | * | | MIPS: Netlogic: Avoid unnecessary cache flushesJayachandran C2011-12-071-3/+2
| | | | | | | | | | | * | | MIPS: Netlogic: add r4k_wait as the cpu_waitJayachandran C2011-12-071-0/+1
| | | | | | | | | | | * | | MIPS: Netlogic: Change load addressJayachandran C2011-12-071-1/+1
| | | | | | | | | | |/ / / | | | | | | | | | |/| | |
| | | | | | | | | | * | | MIPS/Perf-events: Cleanup event->destroy at event initDeng-Cheng Zhu2011-12-071-9/+6
| | | | | | | | | | * | | MIPS/Perf-events: Remove pmu and event state checking in validate_event()Deng-Cheng Zhu2011-12-071-15/+3
| | | | | | | | | | * | | MIPS/Perf-events: Remove erroneous check on active_eventsDeng-Cheng Zhu2011-12-071-5/+0