Merge branch 'for_2_6_33_rc_a' of git://git.pwsan.com/linux-2.6 into omap-fixes-for...
authorTony Lindgren <tony@atomide.com>
Wed, 23 Dec 2009 17:36:18 +0000 (09:36 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 23 Dec 2009 17:36:18 +0000 (09:36 -0800)

Trivial merge