From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 3 Nov 2008 18:15:40 +0000 (-0800)
Subject: Merge branch 'io-mappings-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.28-rc4~91
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=da4a22cba7cb2d922691214aed6b1977f04efaff;p=linux-2.6-omap-h63xx.git

Merge branch 'io-mappings-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'io-mappings-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  io mapping: clean up #ifdefs
  io mapping: improve documentation
  i915: use io-mapping interfaces instead of a variety of mapping kludges
  resources: add io-mapping functions to dynamically map large device apertures
  x86: add iomap_atomic*()/iounmap_atomic() on 32-bit using fixmaps
---

da4a22cba7cb2d922691214aed6b1977f04efaff