]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'mvebu/regmap' into for-next
authorJason Cooper <jason@lakedaemon.net>
Thu, 13 Jun 2013 18:04:40 +0000 (18:04 +0000)
committerJason Cooper <jason@lakedaemon.net>
Thu, 13 Jun 2013 18:04:40 +0000 (18:04 +0000)
commit50531ed35f3951a5e0d5d6c4ea31b603d3852061
treea718286cb2ae123865b4c0596e4a77ac0898bcfe
parent81edb2606382cc2dfaf918e488569555bd4ac17c
parent5fb2038d61ce94e7c9224db2aaff5633ca224953
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