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 Torvalds2012-01-111-4/+4
|\
| * arm/PCI: convert to pci_scan_root_bus() for correct root bus resourcesBjorn Helgaas2012-01-061-4/+4
* | Merge branch 'restart' into for-linusRussell King2012-01-0516-25/+38
|\ \
| * | ARM: restart: remove the now empty arch_reset()Russell King2012-01-051-4/+0
| * | ARM: restart: ixp4xx: use new restart hookRussell King2012-01-0516-21/+38
* | | ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtimeMarc Zyngier2011-12-181-13/+3
* | | 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 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-11-062-0/+2
|\
| * arm: Add export.h to ARM specific files as required.Paul Gortmaker2011-10-312-0/+2
* | Merge branch 'next/board' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-015-1/+376
|\ \ | |/ |/|
| * Merge branch 'depends/rmk/devel-stable' into next/boardArnd Bergmann2011-11-0115-38/+21
| |\
| * \ Merge branch 'depends/rmk/gpio' into next/boardArnd Bergmann2011-10-215-8/+7
| |\ \
| * | | ixp4xx: support omicron ixp425 based boardsRichard Cochran2011-09-305-1/+376
* | | | Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kern...Linus Torvalds2011-10-2814-35/+18
|\ \ \ \ | | |_|/ | |/| |
| * | | 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
| * | | ARM: mach-ixp4xx: convert boot_params to atag_offsetNicolas Pitre2011-08-2112-17/+17
| |/ /
* | | Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-c...Linus Torvalds2011-10-275-8/+7
|\ \ \ | | |/ | |/|
| * | 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: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.hRussell King2011-08-084-8/+4
| |/
* | Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2011-10-261-11/+11
|\ \
| * | locking, ARM: Annotate low level hw locks as rawThomas Gleixner2011-09-131-11/+11
| |/
* | Merge branch 'misc' into for-linusRussell King2011-10-252-2/+3
|\ \
| * | ARM: 7022/1: allow to detect conflicting zreladdrsSascha Hauer2011-10-171-1/+1
| * | ARM: 7006/1: Migrate to asm-generic wrapper supportStephen Boyd2011-10-171-1/+2
| |/
* | ARM: io: remove IO_SPACE_LIMIT from platforms with ISA/PCI and 64K windowRussell King2011-08-171-2/+0
|/
* 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
|/
OpenPOWER on IntegriCloud