Fix some conflicts from merging remote branch korg/linux-3.0.y