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)
commitfbe4dd088f449cbae586aa8af51d271297c75f9f
tree4bef2e3d2fce8ed65dab57948b2ab40745d5397f
parent3f4aa45ceea5789a4aade536acc27f2e0d3da5e1
parent13d1b9575ac2c2da143cd2236b6cf0fc314570f8
parentb816ccc5c01fb7fe1fb001ff7aa5aa7e5a8aa76b
parent86d88bfca4758a9a95cbd183c917d623abc3ce84
Merge branches 'fixes', 'misc', 'pm' and 'sa1100' into for-next
arch/arm/include/asm/thread_info.h
arch/arm/kernel/traps.c
arch/arm/mm/proc-v7.S