Linux 3.11-rc3
Merge remote-tracking branch upstream/$:{upbranch}