summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sa1100
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-07-262-8/+3
|\
| * ARM: convert PCI defines to variablesRob Herring2011-07-122-7/+3
| * ARM: pci: make pcibios_assign_all_busses use pci_has_flagRob Herring2011-07-121-1/+0
* | Merge branch 'devel-stable' into for-nextRussell King2011-07-224-4/+9
|\ \
| * | ARM: mach-sa1100: move ARM_DMA_ZONE_SIZE to mdesc->dma_zone_sizeNicolas Pitre2011-07-184-4/+9
| |/
* | ARM: pm: allow suspend finisher to return error codesRussell King2011-07-021-1/+1
* | ARM: pm: hide 1st and 2nd arguments to cpu_suspend from platform codeRussell King2011-06-241-1/+2
* | ARM: pm: sa1100: move cpu_suspend into C codeRussell King2011-06-242-11/+4
* | ARM: pm: move cpu_init() call into core codeRussell King2011-06-241-2/+0
* | ARM: pm: convert cpu_suspend() to a normal functionRussell King2011-06-241-10/+3
* | ARM: pm: sa1100: no need to re-enable clock switchingRussell King2011-06-241-1/+0
|/
*---. Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generi...Russell King2011-05-231-11/+1
|\ \ \
| | | * ARM: use ARM_DMA_ZONE_SIZE to adjust the zone sizesRussell King2011-05-121-9/+0
| | | * 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: update sa1100 to reflect PXA updatesRussell King2011-05-231-5/+3
* | | ARM / SA1100: Use struct syscore_ops for "core" power managementRafael J. Wysocki2011-04-241-13/+6
|/ /
* | Fix common misspellingsLucas De Marchi2011-03-314-5/+5
|/
* arm: Fold irq_set_chip/irq_set_handlerThomas Gleixner2011-03-291-6/+6
* arm: Cleanup the irq namespaceThomas Gleixner2011-03-294-14/+14
* Merge branch 'p2v' into develRussell King2011-03-161-1/+1
|\
| * ARM: P2V: separate PHYS_OFFSET from platform definitionsRussell King2011-02-171-1/+1
| |
| \
*-. \ Merge branches 'at91', 'ep93xx', 'errata', 'footbridge', 'fncpy', 'gemini', '...Russell King2011-03-162-77/+7
|\ \ \ | | |/ | |/|
| | * ARM: pm: convert sa11x0 to generic suspend/resume supportRussell King2011-02-222-77/+7
| |/
* | ARM: 6658/1: collie: do actually pass locomo_info to locomo driverDmitry Eremin-Solenikov2011-02-111-0/+3
|/
* Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-01-152-46/+46
|\
| * ARM: sa1100: irq_data conversion.Lennert Buytenhek2011-01-132-46/+46
* | Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-01-151-1/+0
|\ \
| * | ARM: Fix build regression on SA11x0, PXA, and H720x targetsRussell King2011-01-151-1/+0
| |/
* | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2011-01-131-1/+1
|\ \ | |/ |/|
| * suspend: constify platform_suspend_opsLionel Debroux2010-11-161-1/+1
* | Merge branch 'clksrc' into develRussell King2011-01-052-28/+31
|\ \
| * | ARM: sa1100: convert sched_clock() to use new infrastructureRussell King2010-12-222-23/+30
| * | ARM: ensure all sched_clock() implementations are notrace markedRussell King2010-12-221-1/+1
| * | ARM: SA11x0: update clock source registrationRussell King2010-12-221-5/+1
| |/
* | ARM: 6607/1: sa1100: Update platform device registrationJochen Friedrich2011-01-031-8/+33
* | ARM: 6606/1: sa1100: Fix platform device registrationJochen Friedrich2011-01-031-3/+4
* | ARM: 6459/2: sa1100: Add nanoEngine PCI support.Marcelo Roberto Jimenez2010-12-216-3/+327
* | ARM: 6458/1: pcmcia: Adds nanoEngine PCMCIA support.Marcelo Roberto Jimenez2010-12-212-1/+31
* | ARM: 6451/1: sa1100: Fix checkpatch.pl issues in arch/arm/mach-sa1100/cpu-sa1...Marcelo Roberto Jimenez2010-12-211-11/+13
* | ARM: 6447/3: sa1100: Put nanoEngine support back in the kernelMarcelo Roberto Jimenez2010-12-214-13/+142
* | ARM: 6450/1: Fix checkpatch.pl issues in arch/arm/mach-sa1100/cpu-sa1100.c.Marcelo Roberto Jimenez2010-11-101-26/+25
|/
* ARM: 6449/1: Fix for compiler warning of uninitialized variable.Marcelo Roberto Jimenez2010-10-271-3/+2
* Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2010-10-242-4/+4
|\
| * Update broken web addresses in arch directory.Justin P. Mattock2010-10-182-4/+4
* | arm: remove machine_desc.io_pg_offst and .phys_ioNicolas Pitre2010-10-2012-24/+0
* | arm: return both physical and virtual addresses from addruartJeremy Kerr2010-10-201-16/+20
* | Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/...Russell King2010-08-061-1/+1
|\ \ | |/ |/|
| * [ARM] pxa: replacing dead SHARPSL_LOCOMO with SHARP_LOCOMOChristoph Egger2010-08-051-1/+1
* | Merge branch 'master' into for-nextJiri Kosina2010-08-042-5/+4
|\ \
OpenPOWER on IntegriCloud