Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Sep 2008 15:14:14 +0000 (08:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Sep 2008 15:14:14 +0000 (08:14 -0700)
commit1910e021f2249402c3f103a5a1a15ebda211d1da
tree1725cefb112859b7a5867dd3df43eeea174c0c36
parent74c7a09aeeaa59984d8487a44b08f66add8b9813
parent44b50e5a1af13c605d6c3b17a60e42eb0ee48d5f
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Fix missing devices due to PCI bridge test in of_create_pci_dev().
  sparc64: Fix disappearing PCI devices on e3500.