Merge remote-tracking branch 'stable/linux-3.12.y' into rpi-3.12.y