For 3.12 kernel, could you please try with the following two patches? If they do not apply cleanly, please try manually merge. They are not generated from the 3.12 kernel from kernel.org.
(Please visit the site to view this file)
(Please visit the site to view this file)