]> err.no Git - linux-2.6/commit
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 14 Jun 2007 22:09:26 +0000 (15:09 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 14 Jun 2007 22:09:26 +0000 (15:09 -0700)
commit0127d6d5d925321650e7b92364420325689a03ef
tree341c0d70c0c21829bc69d28dcdad55d8a90f2153
parent1e0e76cf1376a0a1b49a23396e945456c329814e
parentfc395f8d589f4f0b3fcdd9b8bb84b7cacf711a4f
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]: Fix args to sun4v_ldc_revoke().
  [SPARC64]: Really fix parport.
  [SPARC64]: Fix IO/MEM space sizing for PCI.
  [SPARC64]: Wire up cookie based sun4v interrupt registry.