Merge branch 'for-2.6.39' into for-2.6.40

This commit is contained in:
Mark Brown 2011-05-08 15:33:41 +01:00
commit afd8f37c80