Merge branch 'wm8961' into for-2.6.32