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

Conflicts:
	arch/arm/mach-shmobile/Kconfig
	arch/arm/mach-shmobile/include/mach/r8a7778.h
	arch/arm/mach-shmobile/setup-r8a7778.c
This commit is contained in:
Simon Horman 2013-06-07 14:26:22 +09:00
commit a961ee1c95
11 changed files with 924 additions and 132 deletions