I've just uploaded a new uboot-pr13 that explictly conflicts with kernel-power and kernel-maemo and kernel-hostmode.