Updates for Linux kernel 3.12 (manual update from the master)