Merging with current kernel changes

Merging with current kernel changes