Merge branch 'io-mappings-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel...
commitda4a22cba7cb2d922691214aed6b1977f04efaff
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Nov 2008 18:15:40 +0000 (3 10:15 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Nov 2008 18:15:40 +0000 (3 10:15 -0800)
tree89d3f02b13cd1eb280a33240878880f91066bac2
parent20ebc0073b0fb63ce4a27ca761418ecfdecaadb7
parente5beae16901795223d677f15aa2fe192976278ee
Merge branch 'io-mappings-for-linus-2' of git://git./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
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.c