Merge branch 'gta02-audio' into for-2.6.32