aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma...Linus Torvalds2012-04-041-6/+12
|\
| * MIPS: adapt for dma_map_ops changesAndrzej Pietrasiewicz2012-03-281-6/+12
* | Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2012-03-291-114/+7
|\ \
| * | mips: Use generic posix_types.hH. Peter Anvin2012-02-141-114/+7
* | | Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub...Linus Torvalds2012-03-2811-240/+246
|\ \ \
| * | | Delete all instances of asm/system.hDavid Howells2012-03-281-5/+0
| * | | Disintegrate asm/system.h for MIPSDavid Howells2012-03-2811-238/+249
* | | | Merge branch 'akpm' (Andrew's patch-bomb)Linus Torvalds2012-03-231-0/+4
|\ \ \ \
| * | | | coredump: add VM_NODUMP, MADV_NODUMP, MADV_CLEAR_NODUMPJason Baron2012-03-231-0/+4
| |/ / /
* | | | Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jb...Linus Torvalds2012-03-231-8/+1
|\ \ \ \ | |/ / / |/| | |
| * | | PCI: collapse pcibios_resource_to_busBjorn Helgaas2012-02-231-2/+0
| * | | mips/PCI: get rid of device resource fixupsBjorn Helgaas2012-02-231-5/+1
| * | | mips/PCI: replace pci_probe_only with pci_flagsBjorn Helgaas2012-02-231-2/+1
| |/ /
* | | Merge tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2012-03-211-4/+1
|\ \ \
| * | | irq_domain/mips: Allow irq_domain on MIPSGrant Likely2012-02-241-4/+1
| |/ /
* | | Merge branch 'kmap_atomic' of git://github.com/congwang/linuxLinus Torvalds2012-03-211-1/+1
|\ \ \
| * | | highmem: kill all __kmap_atomic()Cong Wang2012-03-201-1/+1
| | |/ | |/|
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2012-03-203-1/+8
|\ \ \
| * \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-03-092-1/+4
| |\ \ \
| | * | | MIPS: BCM47XX: move and extend sprom parsingHauke Mehrtens2012-03-051-0/+3
| | * | | MIPS: BCM47XX: fix signature of nvram_parse_macaddrHauke Mehrtens2012-03-051-1/+1
| | | |/ | | |/|
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-03-052-4/+19
| |\ \ \ | | | |/ | | |/|
| * | | net: Add framework to allow sending packets with customized CRC.Ben Greear2012-02-241-0/+3
| * | | sock: Introduce the SO_PEEK_OFF sock optionPavel Emelyanov2012-02-211-0/+1
| | |/ | |/|
* | | Merge branch 'perf/urgent' into perf/coreIngo Molnar2012-03-122-4/+19
|\ \ \ | | |/ | |/|
| * | 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
| |/
* | 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-171-1/+13
|\
| * Audit: push audit success and retcode into arch ptrace.hEric Paris2012-01-171-1/+13
* | 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-14107-1068/+24772
|\ \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| *-------------. \ \ Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/...Ralf Baechle2012-01-1182-576/+24059
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| | | | | | | | | * | MIPS: Netlogic: Add support for XLP 3XX coresJayachandran C2011-12-071-1/+3
| | | | | | | | | * | MIPS: Netlogic: Merge some of XLR/XLP wakup codeJayachandran C2011-12-073-8/+27
| | | | | | | | | * | MIPS: Netlogic: Add XLP platform files for XLP SoCJayachandran C2011-12-078-0/+1229
| | | | | | | | | * | MIPS: Netlogic: XLP CPU support.Jayachandran C2011-12-073-5/+18
| | | | | | | | | * | MIPS: Netlogic: Move code common with XLP to common/Jayachandran C2011-12-075-51/+249
| | | | | | | | | * | MIPS: Netlogic: Add basic MSI support for XLR/XLSGanesan Ramalingam2011-12-071-0/+84
| | | | | | | | | * | MIPS: Netlogic: Avoid unnecessary cache flushesJayachandran C2011-12-071-3/+2
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | | | | | | | * | MIPS Kprobes: Support branch instructions probingManeesh Soni2011-12-071-0/+5
| | | | | | | | * | MIPS Kprobes: Refactor branch emulationManeesh Soni2011-12-071-0/+5
| | | |_|_|_|_|/ / | | |/| | | | | |
| | | | | | * | | MIPS: Octeon: Update DMA mapping operations for OCTEON II processors.David Daney2011-12-071-1/+2
| | | | | | * | | MIPS: Octeon: Update feature test functions for new chips and features.David Daney2011-12-072-30/+126
| | | | | | * | | MIPS: Octeon: Update SOC PCI related register definitions for new chips.David Daney2011-12-077-83/+4909
| | | | | | * | | MIPS: Octeon: Rearrange CVMX files in preperation for device treeDavid Daney2011-12-077-0/+7
| | | | | | * | | MIPS: Octeon: Update bootloader board type constants.David Daney2011-12-072-3/+75
| | | | | | * | | MIPS: Octeon: Move some Ethernet support files out of staging.David Daney2011-12-0734-0/+15227