]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
projects / mirror_ubuntu-kernels.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 22fe944 c590cec)
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)
* fbmem:
  Further fbcon sanity checking
  fbmem: fix remove_conflicting_framebuffers races


Trivial merge
Ubuntu combined Linux kernel mirror