Merge branch 'devel-map-io' into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Wed, 4 Aug 2010 11:43:45 +0000 (14:43 +0300)
committerTony Lindgren <tony@atomide.com>
Wed, 4 Aug 2010 11:43:45 +0000 (14:43 +0300)

Trivial merge