tree 2d0757baeb75823a2f0488e9f35b0ca03f975337
parent 8357422d4bf33bc2c35884d4016c3fc9efbbc1d2
parent 5272a7534afc5e888e702ca2c6f439a6c62f3752
author Linus Torvalds <torvalds@linux-foundation.org> 1281633439 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1281633439 -0700

Merge branch 'io_remap_pfn_range' of git://www.jni.nu/cris

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