aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gee...Linus Torvalds2010-10-2229-1534/+826
|\
| * m68k: Add missing I/O macros {in,out}{w,l}_p() for !CONFIG_ISAThorsten Glaser2010-10-221-0/+4
| * m68k: Remove big kernel lock in cache flush codeGeert Uytterhoeven2010-10-221-3/+0
| * m68k: __pa(): cast arg to longAndrew Morton2010-10-221-1/+1
| * m68k/m68knommu: merge the MMU and non-MMU traps.hGreg Ungerer2010-10-223-430/+271
| * m68k/m68knommu: merge MMU and non-MMU thread_info.hGreg Ungerer2010-10-224-181/+109
| * m68k/m68knommu: merge MMU and non-MMU atomic.hGreg Ungerer2010-10-223-358/+207
| * m68k/m68knommu: clean up page.hGreg Ungerer2010-10-223-93/+55
| * m68k/m68knommu: merge machdep.h files into a single fileGreg Ungerer2010-10-223-66/+44
| * m68k/m68knommu: merge MMU and non-MMU string.hGreg Ungerer2010-10-223-260/+131
| * m68k/m68knommu: Remove dead SMP config optionChristian Dietrich2010-10-224-15/+0
| * m68k: move definition of THREAD_SIZE into thread_info_mm.hGreg Ungerer2010-10-222-6/+5
| * m68k: Use asm-generic/ioctls.h (enables termiox)Jeff Mahoney2010-10-221-79/+1
| * m68k: Remove dead GG2 config optionChristian Dietrich2010-10-224-47/+3
* | Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bklLinus Torvalds2010-10-222-0/+2
|\ \
| * | llseek: automatically add .llseek fopArnd Bergmann2010-10-152-0/+2
* | | Fix IRQ flag handling namingDavid Howells2010-10-074-81/+79
| |/ |/|
* | arch/m68k/mac/macboing.c: use unsigned long for irqflagsAndrew Morton2010-10-011-3/+3
* | m68k,m68knommu: Wire up fanotify_init, fanotify_mark, and prlimit64Geert Uytterhoeven2010-09-132-1/+7
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ger...Linus Torvalds2010-08-181-2/+11
|\
| * m68knommu: arch/m68k/include/asm/ide.h fix for nommuJate Sujjavanich2010-08-181-2/+11
* | Make do_execve() take a const filename pointerDavid Howells2010-08-172-2/+6
|/
* defconfig reductionSam Ravnborg2010-08-1412-9657/+4
* Mark arguments to certain syscalls as being constDavid Howells2010-08-131-1/+1
* dma-mapping: remove dma_is_consistent APIFUJITA Tomonori2010-08-111-5/+0
* dma-mapping: unify dma_get_cache_alignment implementationsFUJITA Tomonori2010-08-111-5/+0
* dma-mapping: rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGNFUJITA Tomonori2010-08-111-1/+1
* Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2010-08-101-3/+0
|\
| * remove needless ISA_DMA_THRESHOLDFUJITA Tomonori2010-08-071-3/+0
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6Linus Torvalds2010-08-102-0/+3
|\ \
| * | tty: Add EXTPROC support for LINEMODEhyc@symas.com2010-08-102-0/+3
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gee...Linus Torvalds2010-08-103-5/+14
|\ \ \ | |/ / |/| |
| * | m68k/mac: Fix RTC on PMU machinesFinn Thain2010-08-091-3/+3
| * | m68k/mac: Add color classic ii supportFinn Thain2010-08-091-0/+9
| * | arch/m68k/sun3/leds.c: Checkpatch cleanupAndrea Gelmini2010-08-091-2/+2
| |/
* | alpha/h8300/m68k: remove obsolete <asm/md.h> filesGeert Uytterhoeven2010-08-091-13/+0
* | 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
|\ \
| * | arch: Implement local64_tPeter Zijlstra2010-06-091-0/+1
| |/
* | Merge commit 'v2.6.35' into kbuild/kbuildMichal Marek2010-08-0465-1431/+746
|\ \ | |/
| * Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gee...Linus Torvalds2010-05-276-175/+126
| |\
| | * m68k: amiga - RTC platform device conversionGeert Uytterhoeven2010-05-262-174/+17
| | * m68k: amiga - Parallel port platform device conversionGeert Uytterhoeven2010-05-261-0/+3
| | * m68k: amiga - Serial port platform device conversionGeert Uytterhoeven2010-05-261-0/+3
| | * m68k: amiga - Mouse platform device conversionGeert Uytterhoeven2010-05-261-0/+3
| | * m68k: amiga - Keyboard platform device conversionGeert Uytterhoeven2010-05-261-0/+5
| | * m68k: amiga - Amiga Gayle IDE platform device conversionGeert Uytterhoeven2010-05-262-1/+68
| | * m68k: amiga - A4000T SCSI platform device conversionGeert Uytterhoeven2010-05-261-0/+11
| | * m68k: amiga - A3000 SCSI platform device conversionGeert Uytterhoeven2010-05-261-0/+11