re-merge linux 3.4.92 state