diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-21 10:16:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-21 10:16:56 -0700 |
| commit | 12c71c4b601923a9cc28918e944ec1e8c65ddac9 (patch) | |
| tree | 6644964fa831ea4f11451b05947da904726f76d5 /kernel/events/core.c | |
| parent | 830ac8524f301da8867400777d5c19e6d01ec525 (diff) | |
| parent | f86b11fbc772b5a4926855c6bc1ff3a3d99995a7 (diff) | |
Merge branch 'vm_ioremap_memory-examples'
I'm going to do an -rc8, so I'm just going to do this rather than delay
it any further. They are arguably stable material anyway.
* vm_ioremap_memory-examples:
mtdchar: remove no-longer-used vma helpers
vm: convert snd_pcm_lib_mmap_iomem() to vm_iomap_memory() helper
vm: convert fb_mmap to vm_iomap_memory() helper
vm: convert mtdchar mmap to vm_iomap_memory() helper
vm: convert HPET mmap to vm_iomap_memory() helper
Diffstat (limited to 'kernel/events/core.c')
0 files changed, 0 insertions, 0 deletions