merged linux-3.0.y branch, updated to 3.0.61 as a result