Hi Eduardo, The thermal-soc tree now shares quite a few patches (but not commits) with the thermal tree. These are causing a few unnecessary conflicts, so please clean it up. -- Cheers, Stephen Rothwell -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html