Skip to content
Commit ad41a1e0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 8357422d 5272a753
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment