]> git.baikalelectronics.ru Git - kernel.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 25 Apr 2007 20:51:45 +0000 (13:51 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 25 Apr 2007 20:51:45 +0000 (13:51 -0700)
commit11f9d2b700b64a1156834e421cd21fc1b40f1fd0
tree082a1b9eaa0c17ca6ccae3aef03f58a77d60dc69
parent44d2b62e8a84ddcf3a31353b9d20ac330e32da94
parent8109a6350922e812f7d04ffba883e6fccb411e49
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [PARPORT] SUNBPP: Fix OOPS when debugging is enabled.
  [SPARC] openprom: Switch to ref counting PCI API