summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ixp4xx
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jb...Linus Torvalds2011-07-2913-13/+14
|\
| * PCI: Make the struct pci_dev * argument of pci_fixup_irqs const.Ralf Baechle2011-07-2213-13/+14
* | Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-07-262-5/+5
|\ \
| * | ARM: convert PCI defines to variablesRob Herring2011-07-122-3/+5
| * | ARM: pci: make pcibios_assign_all_busses use pci_has_flagRob Herring2011-07-121-2/+0
| |/
* | Merge branch 'devel-stable' into for-nextRussell King2011-07-2213-4/+48
|\ \
| * | ARM: mach-ixp4xx: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_sizeNicolas Pitre2011-07-1813-4/+48
| | |
| \ \
*-. \ \ Merge branches 'btc', 'dma', 'entry', 'fixes', 'linker-layout', 'misc', 'mmci...Russell King2011-07-222-8/+14
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| | * ARM: fix regression in IXP4xx clocksourceRichard Cochran2011-07-151-2/+8
| |/ |/|
| * ARM: dmabounce: no need to check dev->bus type in needs_bounce functionRussell King2011-07-041-1/+1
| * ARM: dmabounce: get rid of dma_needs_bounce global functionRussell King2011-07-041-6/+6
|/
* Merge git://git.infradead.org/mtd-2.6Linus Torvalds2011-05-271-4/+0
|\
| * mtd: ixp: convert to mtd_device_register()Jamie Iles2011-05-251-4/+0
* | Merge branch 'timers-ptp-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2011-05-251-0/+78
|\ \
| * | ptp: Added a clock driver for the IXP46x.Richard Cochran2011-05-231-0/+78
| |/
* | Merge branch 'devel-stable' into for-linusRussell King2011-05-231-1/+1
|\ \
| * | ARM: zImage: remove the static qualifier from global data variablesNicolas Pitre2011-05-071-1/+1
| |/
| |
| \
*-. \ Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generi...Russell King2011-05-232-33/+2
|\ \ \ | | |/ | |/|
| | * ARM: use ARM_DMA_ZONE_SIZE to adjust the zone sizesRussell King2011-05-122-31/+1
| | * ARM: Replace platform definition of ISA_DMA_THRESHOLD/MAX_DMA_ADDRESSRussell King2011-05-121-2/+1
| |/
* / clocksource: convert ARM 32-bit up counting clocksourcesRussell King2011-05-231-14/+2
|/
* arm: Fold irq_set_chip/irq_set_handlerThomas Gleixner2011-03-291-2/+2
* arm: Cleanup the irq namespaceThomas Gleixner2011-03-2914-45/+45
* Merge branch 'p2v' into develRussell King2011-03-161-1/+1
|\
| * ARM: P2V: separate PHYS_OFFSET from platform definitionsRussell King2011-02-171-1/+1
* | arm/ixp4xx: Rename FREQ macro to avoid collisionsBen Hutchings2011-02-062-4/+5
* | IXP4xx: Fix qmgr_release_queue() flushing unexpected queue entries.Krzysztof Hałasa2011-02-061-4/+5
|/
* ARM: ixp4xx: irq_data conversion.Lennert Buytenhek2011-01-131-21/+21
* Merge branch 'clksrc' into develRussell King2011-01-051-15/+20
|\
| * ARM: ixp4xx: convert sched_clock() to use new infrastructureRussell King2010-12-221-11/+20
| * ARM: ensure all sched_clock() implementations are notrace markedRussell King2010-12-221-1/+1
| * ARM: ixp4xx: update clock source registrationRussell King2010-12-221-5/+1
| |
| \
*-. \ Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'ver...Russell King2011-01-051-2/+2
|\ \ \ | | |/ | |/|
| | * ARM: io: make iounmap() a simple macroRussell King2010-12-081-2/+2
| |/
* / ARM: fix IXP4xx build failureImre Kaloz2010-12-281-1/+1
|/
* arm: remove machine_desc.io_pg_offst and .phys_ioNicolas Pitre2010-10-2012-34/+0
* arm: return both physical and virtual addresses from addruartJeremy Kerr2010-10-201-8/+8
* arm: fix "arm: fix pci_set_consistent_dma_mask for dmabounce devices"FUJITA Tomonori2010-09-222-0/+10
* Merge git://git.infradead.org/mtd-2.6Linus Torvalds2010-08-151-0/+1
|\
| * ARM: Fix gen_nand probe structures contentsMarek Vasut2010-08-121-0/+1
* | Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/...Linus Torvalds2010-08-116-3/+334
|\ \ | |/ |/|
| * IXP4xx: Fix LL debugging on little-endian CPU.Krzysztof Hałasa2010-05-271-0/+2
| * IXP4xx: Fix sparse warnings in I/O primitives.Krzysztof Hałasa2010-05-271-3/+3
| * ixp4xx/vulcan: add PCI supportMarc Zyngier2010-05-272-0/+74
| * ixp4xx: base support for Arcom VulcanMarc Zyngier2010-05-273-0/+255
* | Merge branch 'misc' into develRussell King2010-07-311-1/+2
|\ \
| * | ARM: 6269/1: Add 'code' parameter for hook_fault_code()Kirill A. Shutemov2010-07-271-1/+2
* | | ARM: Remove 'node' argument form arch_adjust_zones()Russell King2010-07-162-5/+5
|/ /
* | Merge branch 'devel-stable' into develRussell King2010-05-177-7/+0
|\|
| * include cleanup: Update gfp.h and slab.h includes to prepare for breaking imp...Tejun Heo2010-03-307-7/+0