]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'mvebu/regmap' into for-next
authorJason Cooper <jason@lakedaemon.net>
Sun, 23 Jun 2013 22:00:22 +0000 (22:00 +0000)
committerJason Cooper <jason@lakedaemon.net>
Sun, 23 Jun 2013 22:00:22 +0000 (22:00 +0000)
commit04864c6813219e906a90a2b3cb27accfebcfaf10
tree275584f20e0e117a60d8fc67727059061b94291f
parent6e87e4a0b7804f1cf55383d4d5c8437502b0bc50
parent1919bff0e25f5f7ce43474a3b972405f51023e99
Merge branch 'mvebu/regmap' into for-next

Conflicts:
arch/arm/mach-mvebu/armada-370-xp.c
arch/arm/configs/mvebu_defconfig
arch/arm/mach-mvebu/armada-370-xp.c