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