Upstream Linux 3.4.96
Merge branch 'immortal-upstream' into immortal-new