From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 21 Apr 2013 17:16:56 +0000 (-0700)
Subject: Merge branch 'vm_ioremap_memory-examples'
X-Git-Tag: firefly_0821_release~3680^2~702
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=12c71c4b601923a9cc28918e944ec1e8c65ddac9;p=firefly-linux-kernel-4.4.55.git

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

12c71c4b601923a9cc28918e944ec1e8c65ddac9