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