summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ixp4xx/include
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/ar...Linus Torvalds2012-10-011-2/+0
|\
| * ARM: make mach/gpio.h headers optionalRob Herring2012-09-141-2/+0
* | ARM: ixp4xx: use __iomem pointers for MMIOArnd Bergmann2012-09-192-7/+8
|/
* Merge branches 'fixes' and 'fixes2' into devel-lateOlof Johansson2012-05-301-78/+1
|\
| * ixp4xx: fix compilation by adding gpiolib supportRichard Cochran2012-05-231-78/+1
* | Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-05-211-1/+1
|\ \
| * | ARM: PCI: provide a default bus scan implementationRussell King2012-05-131-1/+1
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-04-103-25/+2
|\ \ | |/
| * ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbolRob Herring2012-03-251-2/+0
| * ARM: kill off __mem_pciRob Herring2012-03-061-5/+1
| * ARM: ixp4xx: use runtime ioremap hookRob Herring2012-03-062-18/+1
* | ixp4xx_eth: Support the get_ts_info ethtool method.Richard Cochran2012-04-041-0/+3
|/
* Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux ...Russell King2012-02-221-6/+0
|\
| * ARM: remove disable_fiq and arch_ret_to_user macrosRob Herring2012-02-211-6/+0
* | ARM: big removal of now unused arch_idle()Nicolas Pitre2012-01-201-14/+0
* | ARM: mach-ixp4xx: properly disable CPU idle callNicolas Pitre2012-01-201-5/+0
|/
* Merge branch 'restart' into for-linusRussell King2012-01-052-25/+1
|\
| * ARM: restart: remove the now empty arch_reset()Russell King2012-01-051-4/+0
| * ARM: restart: ixp4xx: use new restart hookRussell King2012-01-052-21/+1
* | Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-s...Russell King2011-12-051-5/+0
|\ \ | |/ |/|
| * ARM: big removal of now unused vmalloc.h filesNicolas Pitre2011-11-261-5/+0
* | ARM: restart: only perform setup for restart when soft-restartingRussell King2011-11-211-1/+1
|/
* Merge branch 'next/board' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-011-1/+2
|\
| * Merge branch 'depends/rmk/devel-stable' into next/boardArnd Bergmann2011-11-012-18/+1
| |\
| * \ Merge branch 'depends/rmk/gpio' into next/boardArnd Bergmann2011-10-211-0/+3
| |\ \
| * | | ixp4xx: support omicron ixp425 based boardsRichard Cochran2011-09-301-1/+2
* | | | Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kern...Linus Torvalds2011-10-282-18/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | ARM: mach-ixp4xx: remove mach/memory.hNicolas Pitre2011-10-131-17/+0
| * | | ARM: add an extra temp register to the low level debugging addruart macroNicolas Pitre2011-09-261-1/+1
| |/ /
* | | Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-c...Linus Torvalds2011-10-271-0/+3
|\ \ \ | | |/ | |/|
| * | ARM: gpio: make trivial GPIOLIB implementation the defaultRussell King2011-08-121-0/+2
| * | ARM: gpio: consolidate gpio_to_irqRussell King2011-08-121-0/+1
| |/
* | ARM: io: remove IO_SPACE_LIMIT from platforms with ISA/PCI and 64K windowRussell King2011-08-171-2/+0
|/
* Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-07-261-5/+0
|\
| * ARM: convert PCI defines to variablesRob Herring2011-07-121-3/+0
| * ARM: pci: make pcibios_assign_all_busses use pci_has_flagRob Herring2011-07-121-2/+0
* | ARM: mach-ixp4xx: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_sizeNicolas Pitre2011-07-181-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
| |/
* | ARM: use ARM_DMA_ZONE_SIZE to adjust the zone sizesRussell King2011-05-121-8/+1
* | ARM: Replace platform definition of ISA_DMA_THRESHOLD/MAX_DMA_ADDRESSRussell King2011-05-121-2/+1
|/
* 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-061-2/+3
|/
* ARM: io: make iounmap() a simple macroRussell King2010-12-081-2/+2
* 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-221-0/+2
* Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/...Linus Torvalds2010-08-112-3/+5
|\
OpenPOWER on IntegriCloud