Merge branch 'patches_for_2.6.38rc' of git://git.pwsan.com/linux-2.6 into devel-fixes
authorTony Lindgren <tony@atomide.com>
Fri, 25 Feb 2011 20:27:14 +0000 (12:27 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 25 Feb 2011 20:27:14 +0000 (12:27 -0800)

Trivial merge