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)
commitdf43938bc581f831b80b14ae249078e8da3d6ef5
tree544a9ae62e208a70cca56b5e3cb724b798eec681
parent49f019c188aa1e0ed5c8cffbcc5533dfb0e732dd
parentc47747fde931c02455683bd00ea43eaa62f35b0e
Merge branch 'fbmem'

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