Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Mar 2010 05:29:38 +0000 (21:29 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Mar 2010 05:29:38 +0000 (21:29 -0800)
commit3474cbd11df8cdd6413781ea95bd51dd469098ff
treec8d78f415c00bad503541bee6dd68055997c3ad7
parentd89b218b801fd93ea95880f1c7fde348cbcc51c5
parent2d378b9179881b46a0faf11430efb421fe03ddd8
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Add very basic XVR-1000 framebuffer driver.
  qlogicpti: Remove slash in QlogicPTI irq name
drivers/video/Kconfig
drivers/video/Makefile