Merge branch 'io_remap_pfn_range' of git://www.jni.nu/cris
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Aug 2010 17:17:19 +0000 (10:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Aug 2010 17:17:19 +0000 (10:17 -0700)
* 'io_remap_pfn_range' of git://www.jni.nu/cris:
  CRIS: Define io_remap_pfn_range as remap_pfn_range


Trivial merge