summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2013-03-032-1/+3
|\
| *-. Merge branches 'devel-stable', 'fixes' and 'mmci' into for-linusRussell King2013-03-033-2/+4
| |\ \
| | * | ARM: 7654/1: Preserve L_PTE_VALID in pte_modify()Catalin Marinas2013-02-211-1/+2
| | * | ARM: 7653/2: do not scale loops_per_jiffy when using a constant delay clockNicolas Pitre2013-02-211-0/+1
* | | | Merge branch 'for-v3.9' of git://git.linaro.org/people/mszyprowski/linux-dma-...Linus Torvalds2013-02-262-0/+8
|\ \ \ \
| * | | | ARM: dma-mapping: Add arm_iommu_detach_device()Hiroshi Doyu2013-02-251-0/+1
| * | | | ARM: dma-mapping: Add macro to_dma_iommu_mapping()Hiroshi Doyu2013-02-251-0/+6
| * | | | ARM: iommu: Include linux/kref.h in asm/dma-iommu.hLaurent Pinchart2013-02-251-0/+1
* | | | | Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dmaLinus Torvalds2013-02-261-146/+0
|\ \ \ \ \
| * | | | | pl080.h: moved from arm/include/asm/hardware to include/linux/amba/Alessandro Rubini2013-01-131-146/+0
| | |_|_|/ | |/| | |
* | | | | ARM: KVM: Rename KVM_MEMORY_SLOTS -> KVM_USER_MEM_SLOTSMarc Zyngier2013-02-251-1/+1
* | | | | Merge tag 'stable/for-linus-3.9-rc0-tag' of git://git.kernel.org/pub/scm/linu...Linus Torvalds2013-02-242-0/+26
|\ \ \ \ \
| * | | | | xen: event channel arrays are xen_ulong_t and not unsigned longIan Campbell2013-02-201-0/+22
| * | | | | xen: introduce xen_remap, use it instead of ioremapStefano Stabellini2013-02-191-0/+4
| |/ / / /
* | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2013-02-232-19/+1
|\ \ \ \ \
| * | | | | burying unused conditionalsAl Viro2013-02-141-2/+0
| * | | | | arm: switch to generic old sigaction()Al Viro2013-02-031-7/+0
| * | | | | consolidate kernel-side struct sigaction declarationsAl Viro2013-02-031-6/+1
| * | | | | consolidate declarations of k_sigactionAl Viro2013-02-031-4/+0
| |/ / / /
* | | | | Merge tag 'virt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2013-02-215-7/+434
|\ \ \ \ \
| * \ \ \ \ Merge branch 'kvm-arm/timer' of git://git.kernel.org/pub/scm/linux/kernel/git...Olof Johansson2013-02-124-1/+331
| |\ \ \ \ \
| | * | | | | ARM: KVM: arch_timers: Add timer world switchMarc Zyngier2013-02-111-1/+2
| | * | | | | ARM: KVM: arch_timers: Add guest timer core supportMarc Zyngier2013-02-112-0/+90
| | * | | | | Merge branch 'for-arm-soc/arch-timers' of git://git.kernel.org/pub/scm/linux/...Marc Zyngier2013-02-111-6/+103
| | |\ \ \ \ \
| | * | | | | | ARM: KVM: VGIC initialisation codeMarc Zyngier2013-02-111-0/+11
| | * | | | | | ARM: KVM: VGIC interrupt injectionMarc Zyngier2013-02-111-0/+8
| | * | | | | | ARM: KVM: VGIC virtual CPU interface managementMarc Zyngier2013-02-111-0/+31
| | * | | | | | ARM: KVM: VGIC distributor handlingMarc Zyngier2013-02-111-0/+82
| | * | | | | | ARM: KVM: VGIC accept vcpu and dist base addresses from user spaceChristoffer Dall2013-02-111-0/+9
| | * | | | | | ARM: KVM: Initial VGIC infrastructure codeMarc Zyngier2013-02-112-0/+88
| | * | | | | | ARM: KVM: Keep track of currently running vcpusMarc Zyngier2013-02-111-0/+10
| | * | | | | | Merge remote-tracking branch 'arm-soc/irqchip/gic-vic-move' into kvm-arm/vgicMarc Zyngier2013-01-243-114/+1
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge branch 'depends/cleanup' into next/virtOlof Johansson2013-02-112-32/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'depends/rmk-psci' into next/virtOlof Johansson2013-02-113-0/+61
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'irqchip/gic-vic-move' into next/virtOlof Johansson2013-02-113-114/+1
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'for-arm-soc/arch-timers' of git://git.kernel.org/pub/scm/linux/...Olof Johansson2013-02-111-6/+103
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| | * | | | | | | | | arm: arch_timer: move core to drivers/clocksourceMark Rutland2013-01-311-16/+3
| | * | | | | | | | | arm: arch_timer: add arch_counter_set_user_accessMark Rutland2013-01-311-0/+12
| | * | | | | | | | | arm: arch_timer: add isbs to register accessorsMark Rutland2013-01-311-0/+4
| | * | | | | | | | | arm: arch_timer: factor out register accessorsMark Rutland2013-01-311-0/+94
| | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'for-rmk/virt/kvm/core' of git://git.kernel.org/pub/scm/linux/ke...Olof Johansson2013-02-1112-0/+736
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'for-rmk/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/...Olof Johansson2013-02-111-0/+33
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2013-02-211-0/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Merge tag 'omap-for-v3.9/usb-signed' of git://git.kernel.org/pub/scm/linux/ke...Arnd Bergmann2013-02-191-1/+1
| |\| | | | | | | | |
| * | | | | | | | | | Merge tag 'tegra-for-3.9-soc-t114' of git://git.kernel.org/pub/scm/linux/kern...Olof Johansson2013-02-052-0/+50
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| | * | | | | | | | | Merge branch 'for-3.9/scu-base-rework' into for-3.9/soc-t114Stephen Warren2013-01-282-0/+50
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | ARM: Add API to detect SCU base address from CP15Hiroshi Doyu2013-01-281-0/+17
| | | | |/ / / / / / / | | | |/| | | | | | |
* | | | | | | | | | | Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2013-02-211-64/+0
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge tag 'vexpress/drivers-for-3.9' of git://git.linaro.org/people/pawelmoll...Olof Johansson2013-01-301-64/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | arm: Move sp810.h to include/linux/amba/Catalin Marinas2013-01-301-64/+0
| | | |_|_|_|/ / / / / | | |/| | | | | | | |