Merge branch 'for_2.6.36' of git://git.pwsan.com/linux-2.6 into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Tue, 6 Jul 2010 09:18:25 +0000 (12:18 +0300)
committerTony Lindgren <tony@atomide.com>
Tue, 6 Jul 2010 09:18:25 +0000 (12:18 +0300)

Trivial merge