Merge branch 'fbmem'
Linus Torvalds [Sat, 14 May 2011 18:24:32 +0000 (11:24 -0700)]
* fbmem:
  Further fbcon sanity checking
  fbmem: fix remove_conflicting_framebuffers races


Trivial merge