Merge branch 'for_2.6.36' of git://git.pwsan.com/linux-2.6 into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Wed, 4 Aug 2010 05:46:24 +0000 (08:46 +0300)
committerTony Lindgren <tony@atomide.com>
Wed, 4 Aug 2010 05:46:24 +0000 (08:46 +0300)

Trivial merge