Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
Pull ARM updates (part one) from Russell King: - MMC patches from Ulf Hansson and Pawel Moll. These add support for DDR mode and the latest variant found on ARM Versatile Express, as well as a number of cleanups. - A fix for to improve the behaviour of ARMs sched_clock() - Changes to the ARM ioremap() code. I'm not convinced with the primary arguments for this, but it's been around for a while, and people seem happy with it - and the "other" justification for this is at http://lkml.org/lkml/2012/12/6/184 - Add SCHED_HRTICK to ARMs Kconfig - Making the ARM SHA/AES code Thumb-2 compatible - A collection of other small updates. * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (26 commits) ARM: add SCHED_HRTICK config option ARM: 7650/1: mm: replace direct access to mm->context.id with new macro ARM: 7649/1: mm: mm->context.id fix for big-endian ARM: 7648/1: pci: Allow passing per-controller private data ARM: 7647/1: pci: Keep pci_common_init() around after init ARM: fix warnings introduced by previous patch ARM: 7646/1: mm: use static_vm for managing static mapped areas ARM: 7645/1: ioremap: introduce an infrastructure for static mapped area ARM: 7644/1: vmregion: remove vmregion code entirely MAINTAINERS: Re-assert MMCI driver maintainer status MAINTAINERS: add additional file for MMCI driver MAINTAINERS: add maintainer entry for AMBA serial drivers ARM: 7637/1: memory: use SZ_ constants for defining the virtual memory layout ARM: 7643/1: sched: correct update_sched_clock() ARM: 7635/1: versatile: fix the PCI IRQ regression ARM: 7639/1: cache-l2x0: add missed dummy outer_resume entry ARM: 7630/1: mmc: mmci: Fixup and cleanup code for DMA handling ARM: 7632/1: spinlock: avoid exclusive accesses on unlock() path ARM: 7631/1: mmc: mmci: Add new VE MMCI variant ARM: 7623/1: mmc: mmci: Fixup clock gating when freq is 0 for ST-variants ...
No related branches found
No related tags found
Showing
- MAINTAINERS 9 additions, 1 deletionMAINTAINERS
- arch/arm/Kconfig 3 additions, 0 deletionsarch/arm/Kconfig
- arch/arm/crypto/aes-armv4.S 20 additions, 44 deletionsarch/arm/crypto/aes-armv4.S
- arch/arm/crypto/sha1-armv4-large.S 9 additions, 15 deletionsarch/arm/crypto/sha1-armv4-large.S
- arch/arm/include/asm/mach/pci.h 1 addition, 0 deletionsarch/arm/include/asm/mach/pci.h
- arch/arm/include/asm/memory.h 4 additions, 4 deletionsarch/arm/include/asm/memory.h
- arch/arm/include/asm/outercache.h 1 addition, 0 deletionsarch/arm/include/asm/outercache.h
- arch/arm/include/asm/spinlock.h 1 addition, 15 deletionsarch/arm/include/asm/spinlock.h
- arch/arm/kernel/bios32.c 6 additions, 3 deletionsarch/arm/kernel/bios32.c
- arch/arm/kernel/sched_clock.c 2 additions, 2 deletionsarch/arm/kernel/sched_clock.c
- arch/arm/kernel/smp.c 8 additions, 23 deletionsarch/arm/kernel/smp.c
- arch/arm/mach-versatile/core.c 14 additions, 1 deletionarch/arm/mach-versatile/core.c
- arch/arm/mach-versatile/pci.c 6 additions, 5 deletionsarch/arm/mach-versatile/pci.c
- arch/arm/mm/Makefile 1 addition, 1 deletionarch/arm/mm/Makefile
- arch/arm/mm/context.c 3 additions, 0 deletionsarch/arm/mm/context.c
- arch/arm/mm/ioremap.c 93 additions, 42 deletionsarch/arm/mm/ioremap.c
- arch/arm/mm/mm.h 12 additions, 0 deletionsarch/arm/mm/mm.h
- arch/arm/mm/mmu.c 17 additions, 19 deletionsarch/arm/mm/mmu.c
- arch/arm/mm/proc-macros.S 5 additions, 0 deletionsarch/arm/mm/proc-macros.S
- arch/arm/mm/proc-v6.S 1 addition, 1 deletionarch/arm/mm/proc-v6.S
Loading
Please register or sign in to comment