| commit | 47337ad65f823358609865c5dff77404744bc38e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Dec 03 09:19:31 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Dec 03 09:19:31 2010 -0800 |
| tree | 113db6e451267b6d722b908caf4304d1d1457b30 | |
| parent | a9df42e1175d30545ffa1e17a3df1b39c107d33a [diff] | |
| parent | 16cdd4336fdca9b50f991b591005b5f6416f82c4 [diff] |
Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6 * 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6: lxfb: Maintain video processor palette through suspend/resume video: da8xx: Register IRQ as last thing in driver probing. framebuffer: fix fbcmap.c kernel-doc warning