summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jb...Linus Torvalds2012-01-111-9/+10
|\
| * arm/PCI: convert to pci_scan_root_bus() for correct root bus resourcesBjorn Helgaas2012-01-061-9/+10
* | Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2012-01-071-1/+1
|\ \
| * | driver-core: remove sysdev.h usage.Kay Sievers2011-12-211-1/+1
| |/
* | Merge branch 'restart' into for-linusRussell King2012-01-055-11/+11
|\ \
| * | ARM: restart: remove the now empty arch_reset()Russell King2012-01-051-4/+0
| * | ARM: restart: integrator: use new restart hookRussell King2012-01-055-7/+11
| |/
* | Merge branch 'devel-stable' into for-linusRussell King2012-01-051-20/+0
|\ \
| * | ARM: big removal of now unused vmalloc.h filesNicolas Pitre2011-11-261-20/+0
| |/
* | ARM: 7239/1: integrator: explicitly select the serial driversLinus Walleij2011-12-231-0/+4
* | ARM: 7238/1: integrator: only hardcode AP PrimeCell IDsLinus Walleij2011-12-231-5/+14
|/
* Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kern...Linus Torvalds2011-10-283-3/+3
|\
| * Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into d...Russell King2011-10-181-1/+1
| |\
| | * ARM: add an extra temp register to the low level debugging addruart macroNicolas Pitre2011-09-261-1/+1
| * | Merge branch 'kprobes-test' of git://git.yxit.co.uk/linux into devel-stableRussell King2011-09-211-3/+3
| |\ \ | | |/ | |/|
| * | ARM: mach-integrator: convert boot_params to atag_offsetNicolas Pitre2011-08-212-2/+2
* | | Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2011-10-262-10/+10
|\ \ \
| * | | locking, ARM: Annotate low level hw locks as rawThomas Gleixner2011-09-132-10/+10
| | |/ | |/|
* | | Merge branch 'misc' into for-linusRussell King2011-10-254-53/+51
|\ \ \
| * | | ARM: 7087/2: mach-integrator: get timer frequency from clockLinus Walleij2011-10-173-26/+27
| * | | ARM: 7086/2: mach-integrator: modernize clock event registrationLinus Walleij2011-10-171-10/+5
| * | | ARM: 7085/2: mach-integrator: clockevent supports oneshot modeLinus Walleij2011-10-171-5/+19
| * | | ARM: 7084/1: mach-integrator: retire some timer macrosLinus Walleij2011-10-171-12/+0
| * | | ARM: 7022/1: allow to detect conflicting zreladdrsSascha Hauer2011-10-171-1/+1
| |/ /
| | |
| \ \
| \ \
| \ \
*---. \ \ Merge branches 'arnd-randcfg-fixes', 'debug', 'io' (early part), 'l2x0', 'p2v...Russell King2011-10-251-2/+0
|\ \ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| |
| | | * ARM: io: remove IO_SPACE_LIMIT from platforms with ISA/PCI and 64K windowRussell King2011-08-171-2/+0
| | |/ | |/|
* | | mach-integrator: fix VGA base regressionLinus Walleij2011-09-202-2/+2
| |/ |/|
* | ARM: 7081/1: mach-integrator: fix the clocksourceLinus Walleij2011-09-071-3/+3
|/
* Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jb...Linus Torvalds2011-07-291-1/+1
|\
| * PCI: Make the struct pci_dev * argument of pci_fixup_irqs const.Ralf Baechle2011-07-221-1/+1
* | Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-07-262-7/+5
|\ \
| * | ARM: set vga memory base at run-timeRob Herring2011-07-122-2/+2
| * | ARM: convert PCI defines to variablesRob Herring2011-07-122-3/+3
| * | ARM: pci: make pcibios_assign_all_busses use pci_has_flagRob Herring2011-07-121-2/+0
| |/
* / mach-integrator: delete bits.h include fileLinus Walleij2011-07-111-61/+0
|/
*-. 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
| | |/ | |/|