Updated for Kernel 3.16-rc3.