Merge branch 'for-next' of git://gitorious.org/linux-omap-dss2/linux
authorTony Lindgren <tony@atomide.com>
Mon, 30 Nov 2009 17:41:56 +0000 (09:41 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 30 Nov 2009 17:41:56 +0000 (09:41 -0800)

Trivial merge