]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'heads/soc-cleanup-for-v4.1' into next
authorSimon Horman <horms+renesas@verge.net.au>
Thu, 19 Mar 2015 02:02:53 +0000 (11:02 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Thu, 19 Mar 2015 02:02:53 +0000 (11:02 +0900)
commit53a6e52502915f364c87d282b66402f2c333b083
tree7c3cd7a0fcf9feda78dbfb9f1e593606e4890c3a
parent527e79e25f1f7245dd5aea23c94525bd45ae4bf4
parentdf67a2b72eb6fa205c0954e3f4f416e282e7412b
Merge branch 'heads/soc-cleanup-for-v4.1' into next

Conflicts:
arch/arm/mach-shmobile/pm-sh7372.c
arch/arm/mach-shmobile/Makefile
arch/arm/mach-shmobile/common.h