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)
* 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

1  2 
drivers/video/Kconfig
drivers/video/Makefile

Simple merge
Simple merge