Merge branch 'upstream/wm8711' into for-2.6.33