Skip to content
Commit 7ac78347 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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>.
parents 5b65c09e 8c2786cf
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment