Merge branch 'wm8974-upstream' into for-2.6.32