Merge branch 'devel-misc' into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Mon, 2 Aug 2010 11:23:38 +0000 (14:23 +0300)
committerTony Lindgren <tony@atomide.com>
Mon, 2 Aug 2010 11:23:38 +0000 (14:23 +0300)

Trivial merge