Merge branch 'for-2.6.37' into for-2.6.38

This commit is contained in:
Mark Brown 2010-11-10 15:41:12 +00:00
commit 00fb0d98ad
2 changed files with 8 additions and 4 deletions