Merge branches 'audit', 'delay', 'fixes', 'misc' and 'sta2x11' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 27 Jul 2012 22:06:32 +0000 (23:06 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 27 Jul 2012 22:06:32 +0000 (23:06 +0100)
commit91b006def384d8f07f9f324ab211fefe2b085c90
tree55dbdea7b3f9bd9569d12ddb710921e1dbcfcc63
parent28a33cbc24e4256c143dce96c7d93bf423229f92
parentad722541147e6e517a2077e3d944105e7bc4fa8e
parentd0a533b18235d36206b9b422efadb7cee444dfdb
parentff081e05bfba3461119cd280201d163b6858eda2
parent339ca09d7adac80eda8d097ab473c6c23ee86b17
parentcb70706c822c06d727b04b2786f6788dbed4ad1e
Merge branches 'audit', 'delay', 'fixes', 'misc' and 'sta2x11' into for-linus
arch/arm/Kconfig
arch/arm/kernel/arch_timer.c
arch/arm/kernel/armksyms.c
arch/arm/kernel/perf_event.c
arch/arm/kernel/traps.c
arch/arm/lib/Makefile
arch/arm/mm/dma-mapping.c
arch/arm/mm/init.c
arch/arm/mm/mmu.c
drivers/tty/serial/amba-pl011.c