Small merges from linux 3.8 release