[Linux-stable-mirror] Inclusion request for commits b29c6ef7bb12 and 7d5905dc14a8