From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Aug 2010 17:17:19 +0000 (-0700)
Subject: Merge branch 'io_remap_pfn_range' of git://www.jni.nu/cris
X-Git-Tag: v2.6.36-rc1~50
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=ad41a1e0cab07c5125456e8d38e5b1ab148d04aa

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
---

ad41a1e0cab07c5125456e8d38e5b1ab148d04aa