sync up with linux#137

dabrace wants to merge 2 commits intotorvalds:mastertorvalds/linux:masterfrom

dabrace:masterdabrace/linux:masterCopy head branch name to clipboard