Merge tag 'tags/restart-handler-for-v3.18' into v3.18-next/cpuclk