summaryrefslogtreecommitdiffstats
path: root/arch/cris
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://www.jni.nu/crisLinus Torvalds2011-03-285-382/+3
|\
| * Correct auto-restart of syscalls via restartblockJesper Nilsson2011-03-211-1/+1
| * CRISv10: Fix return before mutex_unlock in pcf8563Jesper Nilsson2011-03-211-1/+1
| * Drop the CRISv32 version of pcf8563Jesper Nilsson2011-03-213-380/+1
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...Artem Bityutskiy2011-03-2512-70/+17
|\ \
| * | remove dma64_addr_tFUJITA Tomonori2011-03-231-6/+0
| * | bitops: remove minix bitops from asm/bitops.hAkinobu Mita2011-03-231-1/+0
| * | bitops: remove ext2 non-atomic bitops from asm/bitops.hAkinobu Mita2011-03-231-1/+0
| * | bitops: introduce little-endian bitops for most architecturesAkinobu Mita2011-03-231-0/+1
| * | add the common dma_addr_t typedef to include/linux/types.hFUJITA Tomonori2011-03-221-3/+0
| * | mm: NUMA aware alloc_thread_info_node()Eric Dumazet2011-03-221-1/+1
| | |
| | \
| *-. \ Merge branches 'irq-fixes-for-linus' and 'sched-fixes-for-linus' of git://git...Linus Torvalds2011-03-184-44/+6
| |\ \ \
| | * | | cris: Use generic show_interrupts()Thomas Gleixner2011-03-172-39/+1
| | * | | cris: Use accessor functions to set IRQ_PER_CPU flagThomas Gleixner2011-03-171-3/+3
| | * | | cris: Fix irq conversion falloutThomas Gleixner2011-03-172-2/+2
| | |/ /
| * | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2011-03-181-1/+1
| |\ \ \
| | * | | cris: fix comment typo occationally to occasionallyJustin P. Mattock2011-02-161-1/+1
| * | | | Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...Linus Torvalds2011-03-161-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | percpu: align percpu readmostly subsection to cachelineTejun Heo2011-01-251-1/+1
| | |/ /
| * | | Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2011-03-152-6/+4
| |\ \ \
| | * | | cris: arch-v32: Switch do_timer() to xtime_update()Torben Hohn2011-01-311-4/+2
| | * | | cris: arch-v10: Switch do_timer() to xtime_update()Torben Hohn2011-01-311-2/+2
| | |/ /
| * | | Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2011-03-151-1/+3
| |\ \ \ | | |_|/ | |/| |
| | * | cris: Replace deprecated spinlock initializationThomas Gleixner2011-01-271-1/+3
| | |/
| * / Drop redundant __param section for CRISv32.Jesper Nilsson2011-02-231-5/+0
| |/
* / CRIS: stop checking for MTD_CONCATDmitry Eremin-Solenikov2011-03-114-14/+0
|/
* cris: Use generic irq KconfigThomas Gleixner2011-01-212-5/+3
* cris: Convert V32 interrupt handlingThomas Gleixner2011-01-211-35/+15
* cris: Convert V10 interrupt handlingThomas Gleixner2011-01-211-31/+10
* cris: Use irq handling wrapperThomas Gleixner2011-01-211-2/+2
* kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERTDavid Rientjes2011-01-203-3/+3
* Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2011-01-132-2/+2
|\
| * tree-wide: fix comment/printk typosUwe Kleine-König2010-11-012-2/+2
* | set_rtc_mmss: show warning message only onceStephen Hemminger2011-01-131-1/+1
|/
* Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmare...Linus Torvalds2010-10-281-7/+0
|\
| * Merge branch 'kbuild/rc-fixes' into kbuild/kconfigMichal Marek2010-10-1266-2872/+877
| |\
| * | kbuild: migrate all arch to the kconfig mainmenu upgradeArnaud Lacombe2010-09-191-7/+0
* | | ptrace: cleanup arch_ptrace() on crisNamhyung Kim2010-10-272-16/+14
* | | ptrace: change signature of arch_ptrace()Namhyung Kim2010-10-272-4/+6
* | | mm: remove pte_*map_nested()Peter Zijlstra2010-10-261-2/+0
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6Linus Torvalds2010-10-221-83/+1
|\ \ \
| * | | ioctl: Use asm-generic/ioctls.h on cris (enables termiox)Jeff Mahoney2010-10-221-83/+1
* | | | Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bklLinus Torvalds2010-10-2212-3/+15
|\ \ \ \
| * | | | llseek: automatically add .llseek fopArnd Bergmann2010-10-1512-3/+15
| |/ / /
* | | | Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bklLinus Torvalds2010-10-228-31/+36
|\ \ \ \
| * | | | cris: autoconvert trivial BKL usersArnd Bergmann2010-09-268-31/+36
| |/ / /
* / / / Fix IRQ flag handling namingDavid Howells2010-10-076-38/+93
|/ / /
* | / Make do_execve() take a const filename pointerDavid Howells2010-08-172-3/+7
| |/ |/|
* | defconfig reductionSam Ravnborg2010-08-144-2104/+5
* | archs: replace unifdef-y with header-ySam Ravnborg2010-08-141-3/+2