refs/heads/akpm-base - pub/scm/linux/kernel/git/mpe/linux-next

commit: 36469a05610408bbd1e4705a9e721bf2009135de
[log] [tgz]
author: Michael Ellerman <mpe@ellerman.id.au>
Fri Jun 05 22:17:21 2015 +1000
committer: Michael Ellerman <mpe@ellerman.id.au>
Fri Jun 05 22:17:23 2015 +1000
tree: 82e915342041e1d2bcb44e19d5ace81c2b7b4692
parent: 16511869f20cbfe27289b499820750775c000046 [diff]
parent: 1962ab4acf439b84d6fb3f3c769cf75c23be50f6 [diff]

Merge remote-tracking branch 'init/init-v4.1-rc6'

Conflicts:
	arch/arm/mach-hisi/headsmp.S
	arch/arm/mach-keystone/platsmp.c
	arch/mips/loongson64/common/serial.c

tree: 82e915342041e1d2bcb44e19d5ace81c2b7b4692