]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branches 'devel-stable', 'entry', 'fixes', 'mach-types' and 'misc' into for...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 19 Apr 2013 21:26:55 +0000 (22:26 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 19 Apr 2013 21:26:55 +0000 (22:26 +0100)
commit839387ffd355630bf922b68c7293baf470b0fe8f
tree740cfd46a27514c379e2ff56862ea8ef5d034bac
parent01e1247a303f5a47a6431e09fcef8c08b5084ccd
parent0098fc39e6d575f940487f09f303787efbc7a373
parentf8f02ec25ce3eafb049feeb3abf34fcd6e338241
parentcea15092f098b7018e89f64a5a14bb71955965d5
parent848a7b13aef0d8d611b6461b6cc250319fc1dbe1
parentb361d61dc1aaa9bdac0a0995e443c12146d916fd
Merge branches 'devel-stable', 'entry', 'fixes', 'mach-types' and 'misc' into for-next
16 files changed:
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/include/asm/tlbflush.h
arch/arm/kernel/asm-offsets.c
arch/arm/kernel/entry-armv.S
arch/arm/kernel/entry-common.S
arch/arm/kernel/entry-header.S
arch/arm/kernel/setup.c
arch/arm/kvm/vgic.c
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/timer.c
arch/arm/mm/Kconfig
arch/arm/mm/dma-mapping.c
arch/arm/mm/mmu.c
arch/arm/mm/proc-v6.S
arch/arm/mm/proc-v7.S