]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit
Merge branches 'pinmux' and 'soc' into boards-base
authorSimon Horman <horms+renesas@verge.net.au>
Fri, 7 Jun 2013 05:26:22 +0000 (14:26 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Fri, 7 Jun 2013 05:26:22 +0000 (14:26 +0900)
commita961ee1c95cb7309f619e9e68fe8c4fb73bedf6f
tree54f50bcbd0baa55be24ac7ffbf547b4b55d046a4
parent5fcf4a3c3a5bc08bf72a50ef1332501a3c1b96bb
parent413bfd0e67894c930242482cd15ac09a800e2ab8
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
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/include/mach/r8a7778.h
arch/arm/mach-shmobile/setup-r8a7778.c
arch/arm/mach-shmobile/setup-sh73a0.c