Merge branch 'for_2_6_33_rc_a' of git://git.pwsan.com/linux-2.6 into omap-fixes-2...
authorTony Lindgren <tony@atomide.com>
Wed, 6 Jan 2010 01:17:32 +0000 (17:17 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 6 Jan 2010 01:17:32 +0000 (17:17 -0800)

Trivial merge