Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Mark Brown [Sun, 3 Apr 2011 10:28:29 +0000 (19:28 +0900)]

Trivial merge