Merge remote-tracking branch korg/linux-3.0.y