Updates from Linux 3.10 (thx mrg666)