Merge branches 'soc-r8a7740' and 'pinmux' into boards-armadillo800eva-base

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

Sat, 25 May 2013 04:52:29 +0000 (13:52 +0900)

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

Sat, 25 May 2013 04:52:29 +0000 (13:52 +0900)
author Simon Horman <horms+renesas@verge.net.au>
Sat, 25 May 2013 04:52:29 +0000 (13:52 +0900)
committer Simon Horman <horms+renesas@verge.net.au>
Sat, 25 May 2013 04:52:29 +0000 (13:52 +0900)
diff --cc arch/arm/mach-shmobile/include/mach/r8a7740.h
Simple merge
author	Simon Horman <horms+renesas@verge.net.au>
	Sat, 25 May 2013 04:52:29 +0000 (13:52 +0900)
committer	Simon Horman <horms+renesas@verge.net.au>
	Sat, 25 May 2013 04:52:29 +0000 (13:52 +0900)