Merge branch 'for_2_6_33' of git://git.pwsan.com/linux-2.6 into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Sat, 12 Dec 2009 00:16:02 +0000 (16:16 -0800)
committerTony Lindgren <tony@atomide.com>
Sat, 12 Dec 2009 00:16:02 +0000 (16:16 -0800)

Trivial merge