Merge branch 'integration-2.6.38-for-tony' of git://git.pwsan.com/linux-2.6 into...
authorTony Lindgren <tony@atomide.com>
Wed, 22 Dec 2010 19:32:24 +0000 (11:32 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 22 Dec 2010 19:32:24 +0000 (11:32 -0800)

Trivial merge