summaryrefslogtreecommitdiffstats
path: root/arch/mips
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kmap_atomic' of git://github.com/congwang/linuxLinus Torvalds2012-03-214-9/+9
|\
| * highmem: kill all __kmap_atomic()Cong Wang2012-03-202-3/+3
| * mips: remove the second argument of k[un]map_atomic()Cong Wang2012-03-202-6/+6
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-03-201-1/+1
|\ \
| * | mips: Fix typo in bcm63xx/setup.cMasanari Iida2012-02-051-1/+1
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2012-03-208-162/+709
|\ \ \
| * \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-03-096-157/+661
| |\ \ \
| | * | | MIPS: BCM47XX: provide sprom to bcma busHauke Mehrtens2012-03-051-4/+35
| | * | | MIPS: BCM47XX: move and extend sprom parsingHauke Mehrtens2012-03-054-151/+625
| | * | | MIPS: BCM47XX: fix signature of nvram_parse_macaddrHauke Mehrtens2012-03-051-1/+1
| | * | | MIPS: BCM47XX: return number of written bytes in nvram_getenvHauke Mehrtens2012-03-051-2/+1
| * | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-03-0514-36/+58
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | net: Add framework to allow sending packets with customized CRC.Ben Greear2012-02-241-0/+3
| * | | | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2012-02-211-5/+44
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-02-211-5/+44
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-02-15317-5978/+42555
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | bcma: add PCIe host controllerHauke Mehrtens2012-02-061-5/+44
| * | | | | sock: Introduce the SO_PEEK_OFF sock optionPavel Emelyanov2012-02-211-0/+1
| |/ / / /
* | | | | 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
OpenPOWER on IntegriCloud