Merge branch 'iomap' into cleanup
authorTony Lindgren <tony@atomide.com>
Tue, 28 Feb 2012 22:27:01 +0000 (14:27 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 28 Feb 2012 22:27:01 +0000 (14:27 -0800)

Trivial merge