merge Find5-Kernel-Source-4.2 changes
commit c7b44a43a970b699ecd68655bd6f83a8fbb3d74d