Merge branch 'master' into for-3.19
authorTejun Heo <tj@kernel.org>
Sat, 22 Nov 2014 14:32:08 +0000 (09:32 -0500)
committerTejun Heo <tj@kernel.org>
Sat, 22 Nov 2014 14:32:08 +0000 (09:32 -0500)
commitcceb9bd63373061ad7b75c321808a2fb11c86545
treea70d939eabed2e19538707402441644dfc26990e
parent56e4dea81a55c338eede625f715c7fa21f1a28c4
parent8a84e01e147f44111988f9d8ccd2eaa30215a0f2
Merge branch 'master' into for-3.19

Pull in to receive 54ef6df3f3f1 ("rcu: Provide counterpart to
rcu_dereference() for non-RCU situations").

Signed-off-by: Tejun Heo <tj@kernel.org>
arch/arm64/kernel/psci.c