Merge branch 'for-2.6.38' into for-2.6.39

This commit is contained in:
Mark Brown 2011-01-21 18:30:55 +00:00
commit 477adb06bf
2 changed files with 8 additions and 9 deletions