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)
commitad41a1e0cab07c5125456e8d38e5b1ab148d04aa
tree2d0757baeb75823a2f0488e9f35b0ca03f975337
parent8357422d4bf33bc2c35884d4016c3fc9efbbc1d2
parent5272a7534afc5e888e702ca2c6f439a6c62f3752
Merge branch 'io_remap_pfn_range' of git://jni.nu/cris

* 'io_remap_pfn_range' of git://www.jni.nu/cris:
  CRIS: Define io_remap_pfn_range as remap_pfn_range