Merge branches 'fixes', 'misc', 'pm' and 'sa1100' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 5 Dec 2014 16:30:47 +0000 (16:30 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 5 Dec 2014 16:30:47 +0000 (16:30 +0000)
1  2  3  4 
arch/arm/include/asm/thread_info.h
arch/arm/kernel/traps.c
arch/arm/mm/proc-v7.S

Simple merge
Simple merge
Simple merge