From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 14 May 2011 18:24:32 +0000 (-0700)
Subject: Merge branch 'fbmem'
X-Git-Tag: v2.6.39~25
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afa49791caae70cc3fd665a182eea61250795265;p=pandora-kernel.git

Merge branch 'fbmem'

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

afa49791caae70cc3fd665a182eea61250795265
Reading git-diff-tree failed