Merge tag 'v3.12.47' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-3.12-stable

This is the 3.12.47 stable release