summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ger...Linus Torvalds2009-04-0387-2188/+1588
|\
| * m68knommu: improve compile arch switch settingsGreg Ungerer2009-03-301-7/+7
| * m68knommu: fix 5407 ColdFire UART vector setupGreg Ungerer2009-03-241-4/+4
| * m68knommu: fix 5307 ColdFire UART vector setupGreg Ungerer2009-03-241-4/+4
| * m68knommu: fix 5249 ColdFire UART vector setupGreg Ungerer2009-03-241-2/+2
| * m68knommu: fix 5249 ColdFire UART setupGreg Ungerer2009-03-241-2/+2
| * m68knommu: fix end of uart table markerGreg Ungerer2009-03-241-1/+2
| * m68knommu: switch to using generic_handle_irq()Greg Ungerer2009-03-241-1/+1
| * m68k: merge the mmu and non-mmu versions of tlbflush.hGreg Ungerer2009-03-243-277/+265
| * m68knommu: introduce basic clk infrastructureGreg Ungerer2009-03-242-1/+41
| * 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
| * m68knommu: add a local dma_sync_single_for_cpu() functionGreg Ungerer2009-03-241-1/+7
| * m68knommu: mark all RAM as ZONE_DMAGreg Ungerer2009-03-241-5/+1
* | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2009-04-0318-60/+256
|\ \
| * \ Merge branch 'smsc911x-armplatforms' of git://github.com/steveglen/linux-2.6Russell King2009-04-02699-10790/+31519
| |\ \
| | * | ARM: Add SMSC911X support to Overo platform (V2)Steve Sakoman2009-04-021-0/+65
| | * | arm: update omap_ldp defconfig to use smsc911xStanley.Miao2009-04-021-2/+22
| | * | arm: update realview defconfigs to use smsc911xSteve Glendinning2009-04-022-4/+44
| | * | arm: update pcm037 defconfig to use smsc911xSteve Glendinning2009-04-021-1/+22
| | * | arm: convert omap ldp platform to use smsc911xSteve Glendinning2009-04-021-18/+29
| | * | arm: convert realview platform to use smsc911xSteve Glendinning2009-04-021-8/+9
| | * | arm: convert pcm037 platform to use smsc911xSteve Glendinning2009-04-021-10/+13