Merge branch 'fbmem'
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 May 2011 18:24:32 +0000 (11:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 May 2011 18:24:32 +0000 (11:24 -0700)
commitafa49791caae70cc3fd665a182eea61250795265
tree5a1683ad60a9c789802cfb2ac657981a6e43410e
parent22fe9446e82f1fe4b59900db4599061384efb0ad
parentc590cece75728a85ea06801df3ebad2d7ad8612c
Merge branch 'fbmem'

* fbmem:
  Further fbcon sanity checking
  fbmem: fix remove_conflicting_framebuffers races