Merge branches 'common/pfc' and 'common/clkfwk' into rmobile/marzen