Add some stuff from Linux 3.10