| commit | afa49791caae70cc3fd665a182eea61250795265 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat May 14 11:24:32 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat May 14 11:24:32 2011 -0700 |
| tree | 5a1683ad60a9c789802cfb2ac657981a6e43410e | |
| parent | 22fe9446e82f1fe4b59900db4599061384efb0ad [diff] | |
| parent | c590cece75728a85ea06801df3ebad2d7ad8612c [diff] |
Merge branch 'fbmem' * fbmem: Further fbcon sanity checking fbmem: fix remove_conflicting_framebuffers races