Merge branches 'heads/cleanup-for-v4.4', 'heads/defconfig-for-v4.4' and 'heads/dt...

author Simon Horman <horms+renesas@verge.net.au>

Mon, 12 Oct 2015 00:28:16 +0000 (09:28 +0900)

committer Simon Horman <horms+renesas@verge.net.au>

Mon, 12 Oct 2015 00:28:16 +0000 (09:28 +0900)
author Simon Horman <horms+renesas@verge.net.au>
Mon, 12 Oct 2015 00:28:16 +0000 (09:28 +0900)
committer Simon Horman <horms+renesas@verge.net.au>
Mon, 12 Oct 2015 00:28:16 +0000 (09:28 +0900)
diff --cc arch/arm/mach-shmobile/pm-rmobile.c
Simple merge
author	Simon Horman <horms+renesas@verge.net.au>
	Mon, 12 Oct 2015 00:28:16 +0000 (09:28 +0900)
committer	Simon Horman <horms+renesas@verge.net.au>
	Mon, 12 Oct 2015 00:28:16 +0000 (09:28 +0900)