From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 14 Mar 2010 05:29:38 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: Ubuntu-goldfish-3.4.0-4.27~7844
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3474cbd11df8cdd6413781ea95bd51dd469098ff;p=mirror_ubuntu-zesty-kernel.git

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

3474cbd11df8cdd6413781ea95bd51dd469098ff