Merge branch 'iomap' into cleanup
authorTony Lindgren <tony@atomide.com>
Thu, 23 Feb 2012 19:53:47 +0000 (11:53 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 23 Feb 2012 19:53:47 +0000 (11:53 -0800)

Trivial merge