summaryrefslogtreecommitdiffstats
path: root/arch/cris
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'cris-correction-for-3.14' of git://jni.nu/crisLinus Torvalds2014-01-281-0/+1
|\
| * CRISv10: Readd missing headerJesper Nilsson2014-01-281-0/+1
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2014-01-281-2/+0
|\ \ | |/ |/|
| * cramfs: take headers to fs/cramfsAl Viro2014-01-251-2/+0
* | Merge tag 'cris-for-3.14' of git://jni.nu/crisLinus Torvalds2014-01-2728-333/+299
|\ \
| * | Drop code for CRISv10 CPU simulatorJesper Nilsson2014-01-1511-143/+66
| * | Cleanup whitespace, remove old author tagJesper Nilsson2014-01-091-63/+61
| * | CRIS: Add missing syscallsJesper Nilsson2014-01-094-92/+140
| * | cris: sync_serial: remove interruptible_sleep_onArnd Bergmann2014-01-092-2/+6
| * | cris: remove deprecated IRQF_DISABLEDMichael Opdenacker2014-01-0814-34/+27
| |/
* | 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 tag 'pm+acpi-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2013-11-141-2/+0
|\ \ \
| * | | cpufreq: remove CONFIG_CPU_FREQ_TABLEViresh Kumar2013-10-161-2/+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
|/
* Remove GENERIC_HARDIRQ config optionMartin Schwidefsky2013-09-131-1/+0
* arch: mm: pass userspace fault flag to generic fault handlerJohannes Weiner2013-09-121-2/+4
* CRIS: drop unused Kconfig symbolsPaul Bolle2013-09-104-467/+0
* CRIS: Add kvm_para.h which includes generic fileJesper Nilsson2013-09-101-0/+1
* CRIS: remove unused current_regsJesper Nilsson2013-09-101-1/+0
* CRIS: Remove last traces of legacy RTC driversPaul Bolle2013-09-103-81/+0
* CRIS: remove "config OOM_REBOOT"Paul Bolle2013-09-101-3/+0
* cris: delete __cpuinit usage from all cris filesPaul Gortmaker2013-07-141-1/+1
* 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-093-6/+4
|\
| * net: Add missing dependencies on NETDEVICESBen Hutchings2013-06-192-4/+2
| * net: Move MII out from under NET_CORE and hide itBen Hutchings2013-06-192-2/+0
| * net: add socket option for low latency pollingEliezer Tamir2013-06-171-0/+2
* | Merge branch 'akpm' (updates from Andrew Morton)Linus Torvalds2013-07-032-34/+4
|\ \
| * | mm/CRIS: clean up unused VALID_PAGE()Jiang Liu2013-07-031-1/+0
| * | mm/cris: prepare for removing num_physpages and simplify mem_init()Jiang Liu2013-07-031-31/+2
| * | mm: concentrate modification of totalram_pages into the mm coreJiang Liu2013-07-031-1/+1
| * | mm: enhance free_reserved_area() to support poisoning memory with zeroJiang Liu2013-07-031-1/+1
* | | Merge tag 'pm+acpi-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2013-07-031-0/+2
|\ \ \
| * | | cpufreq: cris: select CPU_FREQ_TABLEViresh Kumar2013-06-181-0/+2
| | |/ | |/|