Merge branch 'devel-map-io' into for-next
authorTony Lindgren <tony@atomide.com>
Tue, 3 Aug 2010 08:48:01 +0000 (11:48 +0300)
committerTony Lindgren <tony@atomide.com>
Tue, 3 Aug 2010 08:48:01 +0000 (11:48 +0300)

Trivial merge