Linux 3.4.80
Merge remote-tracking branch 'upstream/master'