Merge branch 'for_tony_a_2.6.39rc' of git://git.pwsan.com/linux-2.6 into devel-fixes
Tony Lindgren [Wed, 27 Apr 2011 13:15:27 +0000 (06:15 -0700)]

Trivial merge