Changes needed to 3.16 kernel version applied.