summaryrefslogtreecommitdiffstats
path: root/arch/cris/include
Commit message (Expand)AuthorAgeFilesLines
* sys_sgetmask/sys_ssetmask: add CONFIG_SGETMASK_SYSCALLFabian Frederick2014-06-041-1/+0
* Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2014-06-032-13/+4
|\
| * arch,cris: Convert smp_mb__*()Peter Zijlstra2014-04-182-13/+4
* | PCI: Turn pcibios_penalize_isa_irq() into a weak functionHanjun Guo2014-05-271-1/+0
|/
* Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2014-04-012-6/+1
|\
| * arch: Remove stub cputime.h headersFrederic Weisbecker2014-03-132-6/+1
* | Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2014-03-311-1/+2
|\ \ | |/
| * locking/mcs: Allow architecture specific asm files to be used for contended caseTim Chen2014-02-091-0/+1
| * locking/mcs: Order the header files in Kbuild of each architecture in alphabe...Tim Chen2014-02-091-1/+1
* | cris: convert ffs from an object-like macro to a function-like macroGeert Uytterhoeven2014-03-101-1/+1
|/
* Merge tag 'cris-for-3.14' of git://jni.nu/crisLinus Torvalds2014-01-275-35/+24
|\
| * Drop code for CRISv10 CPU simulatorJesper Nilsson2014-01-151-28/+1
| * CRIS: Add missing syscallsJesper Nilsson2014-01-092-1/+17
| * cris: remove deprecated IRQF_DISABLEDMichael Opdenacker2014-01-082-6/+6
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2014-01-252-0/+3
|\ \
| * | net: introduce SO_BPF_EXTENSIONSMichal Sekletar2014-01-181-0/+2
| * | net: resort some Kbuild files to hopefully help avoid some conflictsStephen Rothwell2014-01-131-1/+1
| * | lib: Add missing arch generic-y entries for asm-generic/hash.hDavid S. Miller2013-12-171-0/+1
| |/
* | cris: provide {in,out}[wl]_p()Geert Uytterhoeven2014-01-231-0/+4
* | arch: Re-sort some Kbuild files to hopefully help avoid some conflictsStephen Rothwell2014-01-131-1/+1
* | arch: Clean up asm/barrier.h implementations using asm-generic/barrier.hPeter Zijlstra2014-01-122-25/+1
|/
* Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2013-11-192-14/+0
|\
| * preempt: Make PREEMPT_ACTIVE genericThomas Gleixner2013-11-131-2/+0
| * hardirq: Make hardirq bits genericThomas Gleixner2013-11-131-12/+0
* | cris: handle pgtable_page_ctor() failKirill A. Shutemov2013-11-151-1/+4
* | cris: fix potential NULL-pointer dereferenceKirill A. Shutemov2013-11-151-0/+2
* | Merge tag 'pci-v3.13-changes' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2013-11-141-1/+0
|\ \
| * | cris/PCI: Remove unused pci_mem_startMyron Stowe2013-10-071-1/+0
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2013-11-131-0/+2
|\ \ \
| * | | net: introduce SO_MAX_PACING_RATEEric Dumazet2013-09-281-0/+2
| |/ /
* | | cris: media platform drivers: fix buildMauro Carvalho Chehab2013-11-131-0/+1
| |/ |/|
* | sched, arch: Create asm/preempt.hPeter Zijlstra2013-09-251-0/+1
|/
* CRIS: Add kvm_para.h which includes generic fileJesper Nilsson2013-09-101-0/+1
* CRIS: remove unused current_regsJesper Nilsson2013-09-101-1/+0
* net: rename busy poll socket op and globalsEliezer Tamir2013-07-101-1/+1
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2013-07-091-0/+2
|\
| * net: add socket option for low latency pollingEliezer Tamir2013-06-171-0/+2
* | Merge branch 'akpm' (updates from Andrew Morton)Linus Torvalds2013-07-031-1/+0
|\ \
| * | mm/CRIS: clean up unused VALID_PAGE()Jiang Liu2013-07-031-1/+0
* | | Merge branch 'exotic-arch-fixes' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2013-07-033-6/+7
|\ \ \ | |/ / |/| |
| * | cris: Wire up asm-generic/vga.hGeert Uytterhoeven2013-06-161-0/+1
| * | cris: Wire up asm-generic/xor.hGeert Uytterhoeven2013-06-161-0/+1
| * | cris: Switch to asm-generic/linkage.hGeert Uytterhoeven2013-06-162-6/+1
| * | cris: Provide inb_p() and outb_p()Geert Uytterhoeven2013-06-161-0/+3
| * | cris: Provide <asm/kvm_para.h>Geert Uytterhoeven2013-06-161-0/+1
| |/
* | Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2013-07-021-1/+1
|\ \
| * | sched: Rename sched.c as sched/core.c in comments and DocumentationViresh Kumar2013-06-191-1/+1
| |/
* | consolidate io_remap_pfn_range definitionsAl Viro2013-06-291-3/+0
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2013-05-011-0/+2
|\
| * net: add option to enable error queue packets waking selectKeller, Jacob E2013-03-311-0/+2
OpenPOWER on IntegriCloud