From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 9 Jun 2007 01:15:23 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.22-rc5~59
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7ac7834765e1c888ab06f677d906179858627f26;p=linux-2.6-omap-h63xx.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]: Handle PCI bridges without 'ranges' property.
  [SPARC64]: Include <linux/rwsem.h> instead of <asm/rwsem.h>.
---

7ac7834765e1c888ab06f677d906179858627f26