Revert "Updates from Linux 3.10 (thx mrg666)"

This reverts commit 2a42904dd0459af11da4a744f3724b3b2bd7e246.