Merge branch 'upstream/wm8974' into for-2.6.33