Add some stuff from Linux 3.10
Add some stuff from Linux 3.10