Merge upstream

Merge ville upstream for 3.4.x kernel changes.