Merge branch 'for_2.6.33rc_d' of git://git.pwsan.com/linux-2.6 into omap-fixes-for...
authorTony Lindgren <tony@atomide.com>
Wed, 20 Jan 2010 21:09:09 +0000 (13:09 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 20 Jan 2010 21:09:09 +0000 (13:09 -0800)

Trivial merge