From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 14 May 2011 18:24:32 +0000 (-0700)
Subject: Merge branch 'fbmem'
X-Git-Tag: v6.6-pxa1908~30833
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=afa49791caae70cc3fd665a182eea61250795265;p=linux.git

Merge branch 'fbmem'

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

afa49791caae70cc3fd665a182eea61250795265