summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator
Commit message (Expand)AuthorAgeFilesLines
*---. Merge branches 'amba', 'devel-stable', 'fixes', 'mach-types', 'mmci', 'pci' a...Russell King2012-05-216-123/+49
|\ \ \
| | | * ARM: 7389/2: plat-versatile: modernize FPGA IRQ controllerLinus Walleij2012-05-044-101/+44
| | |/ | |/|
| | * ARM: PCI: provide a default bus scan implementationRussell King2012-05-132-8/+2
| | * ARM: PCI: integrator: use common PCI swizzleRussell King2012-05-131-14/+3
| |/
* / ARM: 7371/1: integrator: factor out dynamic amba device allocatorLinus Walleij2012-04-191-15/+7
|/
* Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm...Linus Torvalds2012-03-291-1/+0
|\
| * ARM: kill off __mem_pciRob Herring2012-03-061-1/+0
* | Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-03-296-6/+19
|\ \
| * \ Merge branch 'devel-stable' into for-linusRussell King2012-03-275-137/+25
| |\ \
| * | | ARM: 7349/1: integrator: convert to sparse irqsLinus Walleij2012-03-246-6/+12
| * | | ARM: 7310/1: integrator: implement sched_clock across all boardsLinus Walleij2012-03-242-0/+8
* | | | Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub...Linus Torvalds2012-03-284-4/+0
|\ \ \ \
| * | | | Disintegrate asm/system.h for ARMDavid Howells2012-03-284-4/+0
| |/ / /
* | | | Merge branch 'for-armsoc' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-03-235-142/+25
|\ \ \ \ | | |_|/ | |/| |
| * | | 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
| | |/
| * | Merge branch 'amba' into for-armsocRussell King2012-01-263-103/+25
| |\ \
| | * | ARM: amba: integrator: use common amba device initializersRussell King2012-01-262-97/+22
| | * | ARM: amba: integrator/realview/versatile/vexpress: get rid of NO_IRQ initiali...Russell King2012-01-252-7/+7
| | * | ARM: amba: integrator: convert to use amba_device_allocRussell King2012-01-251-6/+3
| | |/
| * / ARM: big removal of now unused arch_idle()Nicolas Pitre2012-01-201-33/+0
| |/
* / arm/PCI: get rid of device resource fixupsBjorn Helgaas2012-02-231-3/+4
|/
* 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
|/