diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 19:17:19 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 19:17:19 +0200 |
commit | ad41a1e0cab07c5125456e8d38e5b1ab148d04aa (patch) | |
tree | 2d0757baeb75823a2f0488e9f35b0ca03f975337 /arch/ia64/include/asm/atomic.h | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm (diff) | |
parent | CRIS: Define io_remap_pfn_range as remap_pfn_range (diff) | |
download | linux-ad41a1e0cab07c5125456e8d38e5b1ab148d04aa.tar.xz linux-ad41a1e0cab07c5125456e8d38e5b1ab148d04aa.zip |
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 'arch/ia64/include/asm/atomic.h')
0 files changed, 0 insertions, 0 deletions