summaryrefslogtreecommitdiffstats
path: root/arch/m68k/include
Commit message (Expand)AuthorAgeFilesLines
* m68k,m68knommu: Wire up preadv and pwritevGeert Uytterhoeven2009-04-221-1/+3
* Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2009-04-051-0/+1
|\
| * Merge branch 'tracing/core-v2' into tracing-for-linusIngo Molnar2009-04-021-0/+1
| |\
| | * tracing: make CALLER_ADDRx overwriteableUwe Kleine-Koenig2009-03-021-0/+1
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/rtc-pariscLinus Torvalds2009-04-031-2/+5
|\ \ \
| * | | m68k: Hook up rtc-genericGeert Uytterhoeven2009-04-021-2/+5
| |/ /
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ger...Linus Torvalds2009-04-0378-2160/+1517
|\ \ \ | |/ / |/| |
| * | m68k: merge the mmu and non-mmu versions of tlbflush.hGreg Ungerer2009-03-243-277/+265
| * | m68k: merge the mmu and non-mmu versions of module.hGreg Ungerer2009-03-243-54/+47
| * | m68knommu: add missing interrupt line definition for UART 2Greg Ungerer2009-03-241-0/+1
| * | m68k: merge the mmu and non-mmu versions of mmu_context.hGreg Ungerer2009-03-243-190/+173
| * | m68k: merge the mmu and non-mmu versions of current.hGreg Ungerer2009-03-243-34/+27
| * | m68k: merge the mmu and non-mmu versions of div64.hGreg Ungerer2009-03-243-33/+33
| * | m68k: merge the mmu and non-mmu versions of bugs.hGreg Ungerer2009-03-243-33/+18
| * | m68k: merge the mmu and non-mmu versions of bug.hGreg Ungerer2009-03-243-36/+28
| * | m68k: use the mmu version of cache.h for m68knommu as wellGreg Ungerer2009-03-243-27/+10
| * | m68k: use the mmu version of bootinfo.h for m68knommu as wellGreg Ungerer2009-03-243-384/+377
| * | m68k: merge the mmu and non-mmu versions of fb.hGreg Ungerer2009-03-243-50/+37
| * | m68k: merge the mmu and non-mmu versions of segment.hGreg Ungerer2009-03-243-111/+61
| * | m68k: merge the mmu and non-mmu versions of ucontext.hGreg Ungerer2009-03-243-66/+29
| * | m68k: Restore correct include guards for <asm/unaligned.h>Geert Uytterhoeven2009-03-241-3/+3
| * | m68k: Use dma_addr_t for scatterlist.dma_addressGeert Uytterhoeven2009-03-241-1/+1
| * | m68k: merge the mmu and non-mmu versions of pgalloc.hGreg Ungerer2009-03-243-28/+17
| * | m68knommu: mv definition of check_pgt_cache()Greg Ungerer2009-03-242-2/+2
| * | m68k: merge the mmu and non-mmu versions of page_offset.hGreg Ungerer2009-03-243-16/+9
| * | m68k: the one hw_irq.h can be used buy all m68kGreg Ungerer2009-03-243-14/+5
| * | m68k: use non-mmu version of unaligned.h for all m68kGreg Ungerer2009-03-243-41/+23
| * | m68k: use mmu version of elf.h for non-mmu builds as wellGreg Ungerer2009-03-243-232/+117
| * | m68k: use mmu timex.h for non-mmu setups as wellGreg Ungerer2009-03-243-45/+17
| * | m68k: use mmu fpu.h for non-mmu builds as wellGreg Ungerer2009-03-243-45/+19
| * | m68k: use mmu scatterlist.h for non-mmu setups as wellGreg Ungerer2009-03-243-49/+22
| * | m68k: merge the mmu and non-mmu versions of mmu.hGreg Ungerer2009-03-243-20/+11
| * | m68knommu: remove no longer used mcfpci.hGreg Ungerer2009-03-241-119/+0
| * | m68k: use mmu kmap_types.h for non-mmu setups as wellGreg Ungerer2009-03-243-47/+21
| * | m68k: use the mc146818rtc.h for non-mmu setups as well.Greg Ungerer2009-03-243-40/+26
| * | m68k: swtich non-mmu setups to use the mmu dma-mapping.hGreg Ungerer2009-03-243-121/+110
| * | m68k: use the mmu pci.h for m68knommu as wellGreg Ungerer2009-03-243-46/+12
* | | ide: cleanup <asm-m68k/ide.h>Bartlomiej Zolnierkiewicz2009-03-271-34/+0
* | | ide: remove IDE_ARCH_LOCK (v2)Bartlomiej Zolnierkiewicz2009-03-271-36/+0
* | | ide: remove IDE_ARCH_INTR (v2)Bartlomiej Zolnierkiewicz2009-03-271-3/+0
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gee...Linus Torvalds2009-03-262-1/+9
|\ \ \
| * | | m68k: irq_node.handler() should return irqreturn_tGeert Uytterhoeven2009-03-261-1/+2
| * | | m68k: mac - Add a new entry in mac_model to identify the floppy controller type.Laurent Vivier2009-03-261-0/+7
| |/ /
* | | Merge branch 'master' of /home/davem/src/GIT/linux-2.6/David S. Miller2009-03-2624-1907/+1209
|\ \ \ | |/ /
| * | m68k: merge the non-MMU and MMU versions of siginfo.hGreg Ungerer2009-03-173-101/+95
| * | m68k: use the MMU version of unistd.h for all m68k platformsGreg Ungerer2009-03-173-749/+372
| * | m68k: merge the non-MMU and MMU versions of signal.hGreg Ungerer2009-03-173-369/+212
| * | m68k: merge the non-MMU and MMU versions of ptrace.hGreg Ungerer2009-03-173-170/+85
| * | m68k: use MMU version of setup.h for both MMU and non-MMUGreg Ungerer2009-03-173-389/+374
| * | m68k: merge the non-MMU and MMU versions of sigcontext.hGreg Ungerer2009-03-163-39/+22
OpenPOWER on IntegriCloud