summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator
Commit message (Expand)AuthorAgeFilesLines
*-. Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generi...Russell King2011-05-232-14/+12
|\ \
| * | ARM: 6910/1: MTD: physmap: let set_vpp() pass a platform_device instead of a ...Marc Zyngier2011-05-202-2/+2
| * | ARM: 6905/1: Integrator/CP: Use physmap driver instead of integrator-flashMarc Zyngier2011-05-201-7/+6
| * | ARM: 6908/1: Integrator/AP: Use physmap driver instead of integrator-flashMarc Zyngier2011-05-201-7/+6
| |/
* | clockevents: ARM sp804: allow clockevent name to be specifiedRussell King2011-05-231-1/+1
* | clocksource: ARM sp804: obtain sp804 timer rate via clksRussell King2011-05-231-0/+7
* | clocksource: ARM sp804: allow clocksource name to be specifiedRussell King2011-05-231-1/+1
* | clocksource: convert Integrator/AP 16-bit down counting clocksourceRussell King2011-05-232-18/+4
* | ARM / Integrator: Use struct syscore_ops for core PMRafael J. Wysocki2011-04-241-17/+9
|/
*---. Merge branches 'fixes', 'pgt-next' and 'versatile' into develRussell King2011-03-207-209/+92
|\ \ \
| | | * ARM: integrator: add Integrator/CP sched_clock supportRussell King2011-02-191-0/+7
| | | * ARM: integrator/versatile: consolidate FPGA IRQ handling codeRussell King2011-02-192-140/+43
| | | * ARM: integrator: use new init_early for clock tree initRussell King2011-02-194-5/+17
| | | * ARM: integrator: switch Integrator platforms to use consolidated CLCDRussell King2011-02-193-56/+15
| | | * ARM: integrator: support CLCD RGB5551 layout for 16bppRussell King2011-02-192-8/+10
| | |/ | |/|
* / | ARM: P2V: separate PHYS_OFFSET from platform definitionsRussell King2011-02-171-1/+1
|/ /
* | Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-01-152-32/+32
|\ \
| * | ARM: integrator: irq_data conversion.Lennert Buytenhek2011-01-132-32/+32
* | | ARM: integrator: fix compile warning in cpu.cRussell King2011-01-111-1/+1
|/ /
* | Merge branch 'misc' into develRussell King2011-01-064-6/+4
|\ \
| * \ Merge branch 'smp' into miscRussell King2011-01-061-1/+1
| |\ \
| * | | ARM: 6520/1: Kconfig: add new symbol MIGHT_HAVE_PCIHans Ulli Kroll2010-12-051-0/+1
| * | | ARM: 6483/1: arm & sh: factorised duplicated clkdev.cJean-Christop PLAGNIOL-VILLARD2010-11-263-6/+3
| | |/ | |/|
* | | Merge branch 'clksrc' into develRussell King2011-01-051-3/+1
|\ \ \
| * | | ARM: integrator: update clock source registrationRussell King2010-12-221-3/+1
| | |/ | |/|
| | |
| \ \
*-. \ \ Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'ver...Russell King2011-01-051-1/+1
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| | * ARM: 6432/1: move timer-sp.c from versatile to commonRob Herring2010-11-041-1/+1
| |/
* / ARM: 6484/1: fix compile warning in mm/init.cAnand Gadiyar2010-11-211-1/+1
|/
* arm: remove machine_desc.io_pg_offst and .phys_ioNicolas Pitre2010-10-202-4/+0
* arm: return both physical and virtual addresses from addruartJeremy Kerr2010-10-201-6/+4
* ARM: do not define VMALLOC_END relative to PAGE_OFFSETNicolas Pitre2010-10-011-1/+1
* ARM: 6283/1: Remove useless PCIO_BASE definitionseric miao2010-08-051-1/+0
* Merge branch 'misc' into develRussell King2010-07-311-4/+4
|\
| * ARM: 6269/1: Add 'code' parameter for hook_fault_code()Kirill A. Shutemov2010-07-271-4/+4
| |
| \
*-. \ Merge branches 'at91', 'ep93xx', 'kexec', 'iop', 'lmb', 'nomadik', 'nuc', 'pl...Russell King2010-07-314-1/+25
|\ \ \ | |_|/ |/| |
| | * ARM: AMBA: Add pclk definition for platforms using primecellsRussell King2010-07-221-1/+6
| |/ |/|
| * ARM: Convert platform reservations to use LMB rather than bootmemRussell King2010-07-271-2/+2
| * ARM: Move platform memory reservations out of generic codeRussell King2010-07-164-0/+19
|/
* Merge branch 'devel-stable' into develRussell King2010-05-174-3/+2
|\
| * include cleanup: Update gfp.h and slab.h includes to prepare for breaking imp...Tejun Heo2010-03-304-3/+2
* | ARM: Indirect round/set_rate operations through clk structureRussell King2010-05-023-5/+17
* | ARM: Make Integrator/Versatile/Reaview VCO code similarRussell King2010-05-023-17/+11
* | ARM: Integrator: move 16-bit timer support to Integrator/APRussell King2010-05-024-163/+155
* | ARM: Integrator: convert Integrator/CP to use SP804 timer supportRussell King2010-05-022-2/+13
* | ARM: Realview/Versatile/Integrator: remove unused definitions from platform.hRussell King2010-05-021-40/+2
* | ARM: Realview/Versatile/Integrator: separate out common clock codeRussell King2010-05-022-61/+1
* | ARM: ICST: kill duplicate icst codeRussell King2010-05-024-17/+17
* | ARM: ICST: indirect s2div and idx2s arrays via icst_paramsRussell King2010-05-023-0/+8
* | ARM: ICST: move minimum VCO frequency to icst_paramsRussell King2010-05-023-0/+4
* | ARM: ICST: use Hz instead of kHzRussell King2010-05-024-19/+19