Linux 3.13-rc6
Merge remote-tracking branch: upstream/master