summaryrefslogtreecommitdiffstats
path: root/arch/cris
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'timers-timekeeping-for-linus' of git://git.kernel.org/pub/scm/l...Linus Torvalds2010-08-061-3/+0
|\
| * time: Kill off CONFIG_GENERIC_TIMEJohn Stultz2010-07-271-3/+0
* | Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2010-08-061-0/+1
|\ \
| * \ Merge commit 'v2.6.35-rc3' into perf/coreIngo Molnar2010-06-1814-90/+97
| |\ \ | | |/
| * | arch: Implement local64_tPeter Zijlstra2010-06-091-0/+1
* | | Merge branch 'master' into for-nextJiri Kosina2010-06-1616-139/+113
|\ \ \ | | |/ | |/|
| * | Merge branch 'for-linus' of git://www.jni.nu/crisLinus Torvalds2010-06-0114-90/+97
| |\ \ | | |/ | |/|
| | * CRIS: Don't use mask_irq as symbol nameJesper Nilsson2010-05-256-22/+21
| | * CRIS: Simplify param.h by simply including <asm-generic/param.h>Jesper Nilsson2010-05-251-15/+2
| | * CRISv10: Whitespace fixes for hw_settings.SJesper Nilsson2010-05-251-8/+6
| | * CRISv10: Trivial fixes.Jesper Nilsson2010-05-251-8/+7
| | * CRISv32: Fix RS485 port 4 CD Kconfig item.Jesper Nilsson2010-05-251-1/+1
| | * CRISv32: Remove duplicated Kconfig items.Jesper Nilsson2010-05-251-14/+0
| | * cris: push down BKL into some device driversArnd Bergmann2010-04-294-22/+60
| * | cris: use asm-generic/scatterlist.hFUJITA Tomonori2010-05-271-16/+1
| * | fix handling of offsets in cris eeprom.c, get rid of fake on-stack filesAl Viro2010-05-211-14/+7
| * | get rid of home-grown mutex in cris eeprom.cAl Viro2010-05-211-19/+8
* | | arch/cris: Remove unnecessary kmalloc castsJoe Perches2010-06-161-8/+5
|/ /
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2010-05-201-1/+1
|\ \
| * | add descriptive comment for TIF_MEMDIE task flag declaration.Andreas Dilger2010-05-141-1/+1
| |/
* | Merge branch 'timers-for-linus-cleanups' of git://git.kernel.org/pub/scm/linu...Linus Torvalds2010-05-194-82/+18
|\ \
| * | cris: Convert cris to use read/update_persistent_clockJohn Stultz2010-03-134-82/+18
* | | atomic_t: Cast to volatile when accessing atomic variablesAnton Blanchard2010-05-171-1/+1
| |/ |/|
* | include cleanup: Update gfp.h and slab.h includes to prepare for breaking imp...Tejun Heo2010-03-3012-7/+7
* | frv/chris: fix lines with a missing semicolonsDavid Howells2010-03-291-1/+1
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2010-03-122-2/+2
|\ \
| * \ Merge branch 'for-next' into for-linusJiri Kosina2010-03-082-2/+2
| |\ \ | | |/ | |/|
| | * tree-wide: Assorted spelling fixesDaniel Mack2010-02-092-2/+2
* | | pci-dma: add linux/pci-dma.h to linux/pci.hFUJITA Tomonori2010-03-121-2/+0
* | | pci-dma: cris: use include/linux/pci-dma.hFUJITA Tomonori2010-03-121-7/+1
* | | cris arch-v32: use generic ptrace_resume codeChristoph Hellwig2010-03-122-79/+31
* | | cris arch-v10: use generic ptrace_resume codeChristoph Hellwig2010-03-121-51/+0
* | | Add generic sys_ipc wrapperChristoph Hellwig2010-03-122-78/+1
* | | Add generic sys_old_mmap()Christoph Hellwig2010-03-124-20/+3
|/ /
* | cris v32: typo in crisv32_arbiter_unwatch()?Roel Kluin2010-03-061-1/+1
* | cryptocop: fix assertion in create_output_descriptors()Roel Kluin2010-03-061-1/+1
* | cris: convert to use arch_gettimeoffset()john stultz2010-03-062-66/+8
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/...Linus Torvalds2010-03-032-2/+2
|\ \
| * \ Merge branch 'master' into percpuTejun Heo2010-01-0513-90/+42
| |\ \ | | |/
| * | percpu: remove per_cpu__ prefix.Rusty Russell2009-10-292-2/+2
* | | Merge branch 'for-linus' of git://repo.or.cz/cris-mirrorLinus Torvalds2010-03-016-8/+8
|\ \ \
| * | | cris: Fixup last users of irq_chip->typenameThomas Gleixner2009-11-193-3/+3
| * | | CRIS v32: Should index be positive?Roel Kluin2009-11-033-5/+5
| |/ /
* | | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-03-011-1/+1
|\ \ \
| * | | MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itselfRussell King2010-02-201-1/+1
| | |/ | |/|
* | | resource/PCI: mark struct resource as constDominik Brodowski2010-02-221-1/+1
* | | resource/PCI: align functions now return start of resourceDominik Brodowski2010-02-221-8/+6
|/ /
* | Merge branch 'for-33' of git://repo.or.cz/linux-kbuildLinus Torvalds2009-12-174-3/+1
|\ \
| * | drop explicit include of autoconf.hSam Ravnborg2009-12-123-3/+0
| * | kbuild: move asm-offsets.h to include/generatedSam Ravnborg2009-12-121-0/+1
OpenPOWER on IntegriCloud