Merge branch 'fbmem'
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 May 2011 17:42:36 +0000 (10:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 May 2011 17:42:36 +0000 (10:42 -0700)
* fbmem:
  fbmem: make read/write/ioctl use the frame buffer at open time
  fbcon: add lifetime refcount to opened frame buffers


Trivial merge