From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 8 Jun 2007 00:09:01 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~40852
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=34750bb15687fa03ba95a0ccb1307b0727bc308b;p=mirror_ubuntu-artful-kernel.git

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix SBUS IRQ regression caused by PCI-E driver.
  [SPARC64]: Fix 2 bugs in PCI Sabre bus scanning.
---

34750bb15687fa03ba95a0ccb1307b0727bc308b