tree c8d78f415c00bad503541bee6dd68055997c3ad7
parent d89b218b801fd93ea95880f1c7fde348cbcc51c5
parent 2d378b9179881b46a0faf11430efb421fe03ddd8
author Linus Torvalds <torvalds@linux-foundation.org> 1268544578 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1268544578 -0800

Merge git://git.kernel.org/pub/scm/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