Merge branch 'dapm' into for-2.6.32