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

Trivial merge