Merge branch 'upstream/wm8350' into for-2.6.32