]> git.baikalelectronics.ru Git - 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)
commit56755a9c002da299d160ede56601ff4ea44202a3
tree54f50bcbd0baa55be24ac7ffbf547b4b55d046a4
parentee74fc21d93ba26ca49d57d3aa3e9f1ffef4aab6
parent83bf6b6675b2885ac7e93fe72b3c2bb2587359fb
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