branch change
New kernel repo, new config
Merge remote-tracking branch 'upstream/master'