Merge branches 'heads/boards-for-v3.16' and 'heads/clock-for-v3.16' into devel

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

Mon, 14 Apr 2014 03:52:58 +0000 (12:52 +0900)

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

Mon, 14 Apr 2014 03:52:58 +0000 (12:52 +0900)
author Simon Horman <horms+renesas@verge.net.au>
Mon, 14 Apr 2014 03:52:58 +0000 (12:52 +0900)
committer Simon Horman <horms+renesas@verge.net.au>
Mon, 14 Apr 2014 03:52:58 +0000 (12:52 +0900)
diff --cc arch/arm/mach-shmobile/board-lager.c
Simple merge
author	Simon Horman <horms+renesas@verge.net.au>
	Mon, 14 Apr 2014 03:52:58 +0000 (12:52 +0900)
committer	Simon Horman <horms+renesas@verge.net.au>
	Mon, 14 Apr 2014 03:52:58 +0000 (12:52 +0900)