]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit7c1352d721ce34ac00f3b0e9ea2e96cedf7d9fef
treeb08e3a4c652fac9e300dcfa3b6fbe094c6c9a77a
parent2d76d3791a8c8c9d9b4a10f59374fdf1b665adc9
parentbcc09b24f7e50bae5b32c7bd259286643b91d648
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>.