Patch to Linux 3.4.24 (Squashed commit)