summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2011-12-231-12/+4
|\
| * ARM: 7187/1: fix unwinding for XIP kernelsUwe Kleine-König2011-12-061-12/+4
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2011-12-022-11/+1
|\|
| * ARM: 7182/1: ARM cpu topology: fix warningVincent Guittot2011-11-301-1/+1
| * Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/...Russell King2011-11-221-10/+0
| |\
| | * ARM: PMU: remove pmu_init declarationWill Deacon2011-11-161-10/+0
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2011-11-213-0/+5
|\| |
| * | ARM: wire up process_vm_writev and process_vm_readv syscallsRussell King2011-11-171-0/+2
| * | ARM: 7156/1: l2x0: fix compile error on !CONFIG_USE_OFOlof Johansson2011-11-121-0/+2
| * | ARM: 7155/1: arch.h: Declare 'pt_regs' locallyFabio Estevam2011-11-091-0/+1
| |/
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-11-171-0/+3
|\ \ | |/ |/|
| * net: add wireless TX status socket optionJohannes Berg2011-11-091-0/+3
* | Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dmaLinus Torvalds2011-11-041-0/+4
|\ \
| * | ARM: asm/pl080.h: Protect against multiple inclusion of header fileViresh Kumar2011-08-251-0/+4
* | | Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-011-1/+8
|\ \ \
| * \ \ Merge branch 'highbank/soc' into next/socArnd Bergmann2011-11-026-1/+98
| |\ \ \
| | * | | ARM: l2x0: add empty l2x0_of_initRob Herring2011-10-311-1/+8
| | * | | Merge branch 'dt/gic' into highbank/socArnd Bergmann2011-10-3121-110/+202
| | |\ \ \
| | | \ \ \
| | | \ \ \
| | | \ \ \
| | | \ \ \
| | *---. \ \ \ Merge branches 'depends/rmk/io', 'depends/rmk/l2x0' and 'depends/rmk/gpio' in...Arnd Bergmann2011-10-306-1/+91
| | |\ \ \ \ \ \
* | | | | | | | | Merge branch 'next/dt' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-011-2/+8
|\| | | | | | | |
| * | | | | | | | Merge branch 'dt/gic' into next/dtArnd Bergmann2011-10-3121-110/+201
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | ARM: gic: fix irq_alloc_descs handling for sparse irqRob Herring2011-10-311-1/+1
| | * | | | | | | ARM: gic: add OF based initializationRob Herring2011-10-311-0/+1
| | * | | | | | | ARM: gic: add irq_domain supportRob Herring2011-10-311-1/+6
| | * | | | | | | Merge remote-tracking branch 'rmk/devel-stable' into HEADRob Herring2011-10-2421-108/+194
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'omap/dt' into next/dtArnd Bergmann2011-10-311-0/+5
| |\ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \
| | *---. \ \ \ \ \ \ \ Merge branches 'cleanup-part3', 'voltage', 'dmtimer' and 'l3' into dt-baseTony Lindgren2011-10-041-0/+5
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | / / | | | | | |_|_|_|_|/ / | | | | |/| | | | | |
* | | | | | | | | | | Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-011-0/+5
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'next/fixes' into next/cleanupArnd Bergmann2011-10-315-13/+30
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'depends/rmk/memory_h' into next/fixesArnd Bergmann2011-10-314-22/+16
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tegra/cleanup' into next/cleanupArnd Bergmann2011-10-202-19/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'depends/rmk/devel-stable' into next/cleanupArnd Bergmann2011-10-0810-45/+105
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | ARM: 7082/1: platform_device: pdev_archdata: add omap_device pointerKevin Hilman2011-09-211-0/+5
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'next/fixes' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'depends/rmk/memory_h' into next/fixesArnd Bergmann2011-11-014-22/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | / / / / / / / / | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'depends/rmk/gpio' into next/fixesArnd Bergmann2011-10-312-0/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| * | | | | | | | | | | | ARM: pxa: use correct __iomem annotationsArnd Bergmann2011-10-081-1/+1
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kern...Linus Torvalds2011-10-2816-94/+124
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'ppi-irq-core-for-rmk' of git://github.com/mzyngier/arm-platform...Russell King2011-10-2311-51/+81
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | ARM: gic, local timers: use the request_percpu_irq() interfaceMarc Zyngier2011-10-233-11/+8
| | * | | | | | | | | | | ARM: gic: consolidate PPI handlingMarc Zyngier2011-10-235-39/+6
| * | | | | | | | | | | | Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into d...Russell King2011-10-182-12/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | / / / / / / | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_HNicolas Pitre2011-10-131-1/+1
| | * | | | | | | | | | ARM: prepare for removal of a bunch of <mach/memory.h> filesNicolas Pitre2011-09-261-1/+8
| | * | | | | | | | | | Merge the enabling by default of ARM_PATCH_PHYS_VIRTNicolas Pitre2011-08-292-11/+0
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ Merge branch 'for_3_2/for-rmk/arm_cpu_pm' of git://gitorious.org/omap-sw-deve...Russell King2011-09-263-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | ARM: mm: Add strongly ordered descriptor support.Santosh Shilimkar2011-09-232-0/+4
| | * | | | | | | | | | | | ARM: gic: Use cpu pm notifiers to save gic stateColin Cross2011-09-231-0/+8
| | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'pm' into devel-stableRussell King2011-09-222-16/+9
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | ARM: pm: convert some assembly to CRussell King2011-09-201-0/+8