More merges with linux 3.8