Merge mainline (v2.6.34-rc7)