From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 May 2011 17:42:36 +0000 (-0700)
Subject: Merge branch 'fbmem'
X-Git-Tag: firefly_0821_release~7613^2~1453
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=df43938bc581f831b80b14ae249078e8da3d6ef5;p=firefly-linux-kernel-4.4.55.git

Merge branch 'fbmem'

* fbmem:
  fbmem: make read/write/ioctl use the frame buffer at open time
  fbcon: add lifetime refcount to opened frame buffers
---

df43938bc581f831b80b14ae249078e8da3d6ef5