summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-12 10:17:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-12 10:17:19 -0700
commitad41a1e0cab07c5125456e8d38e5b1ab148d04aa (patch)
tree2d0757baeb75823a2f0488e9f35b0ca03f975337 /kernel
parent8357422d4bf33bc2c35884d4016c3fc9efbbc1d2 (diff)
parent5272a7534afc5e888e702ca2c6f439a6c62f3752 (diff)
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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions