tree 6644964fa831ea4f11451b05947da904726f76d5
parent 830ac8524f301da8867400777d5c19e6d01ec525
parent f86b11fbc772b5a4926855c6bc1ff3a3d99995a7
author Linus Torvalds <torvalds@linux-foundation.org> 1366564616 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1366564616 -0700

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