aboutsummaryrefslogtreecommitdiffstats
path: root/arch/cris
Commit message (Expand)AuthorAgeFilesLines
* arch Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUSStephen Rothwell2013-02-271-0/+1
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2013-02-264-13/+9
|\
| * default SET_PERSONALITY() in linux/elf.hAl Viro2013-02-261-3/+0
| * new helper: file_inode(file)Al Viro2013-02-223-10/+9
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2013-02-235-139/+17
|\ \
| * | burying unused conditionalsAl Viro2013-02-142-3/+0
| * | cris: kill weird arguments of sys_{rt_,}sigreturn()Al Viro2013-02-032-16/+8
| * | cris: switch to generic old sigaction()Al Viro2013-02-034-74/+1
| * | cris: switch to generic old sigsuspendAl Viro2013-02-033-23/+1
| * | cris: don't leave ->uc_stack unitialized - we'll use its contents on sigreturnAl Viro2013-02-032-0/+3
| * | cris: switch to generic sigaltstackAl Viro2013-02-033-14/+3
| * | consolidate kernel-side struct sigaction declarationsAl Viro2013-02-031-6/+1
| * | consolidate declarations of k_sigactionAl Viro2013-02-031-3/+0
| |/
* | Merge branch 'akpm' (incoming from Andrew)Linus Torvalds2013-02-211-5/+0
|\ \
| * | cris: use "int" for ssize_t to match size_tGeert Uytterhoeven2013-02-211-5/+0
* | | Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2013-02-212-15/+6
|\ \ \
| * \ \ Merge branch 'clocksource/cleanup' into next/cleanupOlof Johansson2013-01-142-2/+2
| |\ \ \ | | | |/ | | |/|
| * | | time: convert arch_gettimeoffset to a pointerStephen Warren2012-12-242-13/+4
| * | | cris: move usec/nsec conversion to do_slow_gettimeoffsetStephen Warren2012-12-242-3/+3
* | | | Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2013-02-211-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | arch/cris/arch-v32/drivers: remove depends on CONFIG_EXPERIMENTALKees Cook2013-01-111-2/+2
| | |/ | |/|
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2013-02-201-1/+3
|\ \ \
| * \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-02-081-0/+10
| |\ \ \
| * | | | soreuseport: infrastructureTom Herbert2013-01-231-1/+1
| * | | | sk-filter: Add ability to lock a socket filter programVincent Bernat2013-01-171-0/+2
| | |/ / | |/| |
* | | | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/...Rafael J. Wysocki2013-02-181-10/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | cris idle: delete idle and pm_idleLen Brown2013-02-171-10/+1
| |/ /
* / / cris: Provide dma_mmap_coherent() and dma_get_sgtable()Geert Uytterhoeven2013-01-291-0/+10
|/ /
* / ARCH: drivers remove __dev* attributes.Greg Kroah-Hartman2013-01-032-2/+2
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2012-12-204-9/+1
|\
| * unify SS_ONSTACK/SS_DISABLE definitionsAl Viro2012-12-191-6/+0
| * new helper: current_user_stack_pointer()Al Viro2012-12-191-0/+1
| * Bury the conditionals from kernel_thread/kernel_execve seriesAl Viro2012-12-192-3/+0
* | UAPI: Fix up empty files in arch/cris/David Howells2012-12-203-0/+5
* | CRIS: locking: fix the return value of arch_read_trylock()Wei Yongjun2012-12-201-1/+1
* | Merge tag 'disintegrate-cris-20121009' of git://git.infradead.org/users/dhowe...Jesper Nilsson2012-12-2053-639/+682
|\ \
| * | UAPI: (Scripted) Disintegrate arch/cris/include/asmDavid Howells2012-10-0942-519/+553
| * | UAPI: (Scripted) Disintegrate arch/cris/include/arch-v32/archDavid Howells2012-10-095-117/+125
| * | UAPI: (Scripted) Disintegrate arch/cris/include/arch-v10/archDavid Howells2012-10-096-4/+4
* | | CRIS: use kbuild.h instead of defining macros in asm-offset.cJames Hogan2012-12-201-5/+1
* | | Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2012-12-191-2/+0
|\ \ \
| * | | modules: don't hand 0 to vmalloc.Rusty Russell2012-12-131-2/+0
* | | | CRIS: fix I/O macrosCorey Minyard2012-12-181-6/+33
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-12-132-2/+2
|\ \ \ \
| * | | | various: Fix spelling of "registered" in comments.Adam Buchbinder2012-11-192-2/+2
| |/ / /
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2012-12-121-0/+1
|\ \ \ \
| * | | | sk-filter: Add ability to get socket filter program (v2)Pavel Emelyanov2012-11-011-0/+1
| |/ / /
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2012-12-129-227/+67
|\ \ \ \ | | |_|/ | |/| |
| * | | unify default ptrace_signal_deliverAl Viro2012-11-281-6/+0
| * | | flagday: don't pass regs to copy_thread()Al Viro2012-11-282-4/+2