Merge branch 'heads/fixes-for-v3.16' into next

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

Wed, 28 May 2014 03:57:54 +0000 (12:57 +0900)

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

Wed, 28 May 2014 03:57:54 +0000 (12:57 +0900)
author Simon Horman <horms+renesas@verge.net.au>
Wed, 28 May 2014 03:57:54 +0000 (12:57 +0900)
committer Simon Horman <horms+renesas@verge.net.au>
Wed, 28 May 2014 03:57:54 +0000 (12:57 +0900)
diff --cc arch/arm/mach-shmobile/board-armadillo800eva.c
Simple merge
author	Simon Horman <horms+renesas@verge.net.au>
	Wed, 28 May 2014 03:57:54 +0000 (12:57 +0900)
committer	Simon Horman <horms+renesas@verge.net.au>
	Wed, 28 May 2014 03:57:54 +0000 (12:57 +0900)