Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 9 Jun 2007 01:15:23 +0000 (18:15 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 9 Jun 2007 01:15:23 +0000 (18:15 -0700)
commit7ac7834765e1c888ab06f677d906179858627f26
treeb08e3a4c652fac9e300dcfa3b6fbe094c6c9a77a
parent5b65c09e9966cae543d4727984f098b699aa1653
parent8c2786cfa6d15c474ec7030e8161c88e9b5c597d
Merge branch 'master' of /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>.