Patch to 3.4.11 (gregkh)