aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ixp4xx
Commit message (Expand)AuthorAge
* Merge branch 'dt/gic' into highbank/socArnd Bergmann2011-10-31
|\
| * ARM: mach-ixp4xx: remove mach/memory.hNicolas Pitre2011-10-13
| * ARM: add an extra temp register to the low level debugging addruart macroNicolas Pitre2011-09-26
| * ARM: mach-ixp4xx: convert boot_params to atag_offsetNicolas Pitre2011-08-21
| |
| \
*-. \ Merge branches 'depends/rmk/io', 'depends/rmk/l2x0' and 'depends/rmk/gpio' in...Arnd Bergmann2011-10-30
|\ \ \ | |_|/ |/| |
| | * ARM: gpio: make trivial GPIOLIB implementation the defaultRussell King2011-08-12
| | * ARM: gpio: consolidate gpio_to_irqRussell King2011-08-12
| | * ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.hRussell King2011-08-08
| |/ |/|
| * ARM: io: remove IO_SPACE_LIMIT from platforms with ISA/PCI and 64K windowRussell King2011-08-17
|/
* Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jb...Linus Torvalds2011-07-30
|\
| * PCI: Make the struct pci_dev * argument of pci_fixup_irqs const.Ralf Baechle2011-07-22
* | Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-07-26
|\ \
| * | ARM: convert PCI defines to variablesRob Herring2011-07-12
| * | ARM: pci: make pcibios_assign_all_busses use pci_has_flagRob Herring2011-07-12
| |/
* | Merge branch 'devel-stable' into for-nextRussell King2011-07-22
|\ \
| * | ARM: mach-ixp4xx: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_sizeNicolas Pitre2011-07-18
| | |
| \ \
*-. \ \ Merge branches 'btc', 'dma', 'entry', 'fixes', 'linker-layout', 'misc', 'mmci...Russell King2011-07-22
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| | * ARM: fix regression in IXP4xx clocksourceRichard Cochran2011-07-15
| |/ |/|
| * ARM: dmabounce: no need to check dev->bus type in needs_bounce functionRussell King2011-07-04
| * ARM: dmabounce: get rid of dma_needs_bounce global functionRussell King2011-07-04
|/
* Merge git://git.infradead.org/mtd-2.6Linus Torvalds2011-05-27
|\
| * mtd: ixp: convert to mtd_device_register()Jamie Iles2011-05-24
* | Merge branch 'timers-ptp-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2011-05-25
|\ \
| * | ptp: Added a clock driver for the IXP46x.Richard Cochran2011-05-23
| |/
* | Merge branch 'devel-stable' into for-linusRussell King2011-05-23
|\ \
| * | ARM: zImage: remove the static qualifier from global data variablesNicolas Pitre2011-05-07
| |/
| |
| \
*-. \ Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generi...Russell King2011-05-23
|\ \ \ | | |/ | |/|
| | * ARM: use ARM_DMA_ZONE_SIZE to adjust the zone sizesRussell King2011-05-12
| | * ARM: Replace platform definition of ISA_DMA_THRESHOLD/MAX_DMA_ADDRESSRussell King2011-05-12
| |/
* / clocksource: convert ARM 32-bit up counting clocksourcesRussell King2011-05-23
|/
* arm: Fold irq_set_chip/irq_set_handlerThomas Gleixner2011-03-29
* arm: Cleanup the irq namespaceThomas Gleixner2011-03-29
* Merge branch 'p2v' into develRussell King2011-03-16
|\
| * ARM: P2V: separate PHYS_OFFSET from platform definitionsRussell King2011-02-17
* | arm/ixp4xx: Rename FREQ macro to avoid collisionsBen Hutchings2011-02-06
* | IXP4xx: Fix qmgr_release_queue() flushing unexpected queue entries.Krzysztof HaƂasa2011-02-06
|/
* ARM: ixp4xx: irq_data conversion.Lennert Buytenhek2011-01-13
* Merge branch 'clksrc' into develRussell King2011-01-05
|\
| * ARM: ixp4xx: convert sched_clock() to use new infrastructureRussell King2010-12-22
| * ARM: ensure all sched_clock() implementations are notrace markedRussell King2010-12-22
| * ARM: ixp4xx: update clock source registrationRussell King2010-12-22
| |
| \
*-. \ Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'ver...Russell King2011-01-05
|\ \ \ | | |/ | |/|
| | * ARM: io: make iounmap() a simple macroRussell King2010-12-08
| |/
* / ARM: fix IXP4xx build failureImre Kaloz2010-12-28
|/
* arm: remove machine_desc.io_pg_offst and .phys_ioNicolas Pitre2010-10-20
* arm: return both physical and virtual addresses from addruartJeremy Kerr2010-10-20
* arm: fix "arm: fix pci_set_consistent_dma_mask for dmabounce devices"FUJITA Tomonori2010-09-22
* Merge git://git.infradead.org/mtd-2.6Linus Torvalds2010-08-15
|\
| * ARM: Fix gen_nand probe structures contentsMarek Vasut2010-08-11
* | Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/...Linus Torvalds2010-08-11
|\ \ | |/ |/|