Merge branch 'iomem' into release
authorLen Brown <len.brown@intel.com>
Tue, 15 Feb 2011 20:25:48 +0000 (15:25 -0500)
committerLen Brown <len.brown@intel.com>
Tue, 15 Feb 2011 20:25:48 +0000 (15:25 -0500)

Trivial merge