Patch to Linux 3.4.25 (Squashed commit)