| commit | 0127d6d5d925321650e7b92364420325689a03ef | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Jun 14 15:09:26 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Jun 14 15:09:26 2007 -0700 |
| tree | 341c0d70c0c21829bc69d28dcdad55d8a90f2153 | |
| parent | 1e0e76cf1376a0a1b49a23396e945456c329814e [diff] | |
| parent | fc395f8d589f4f0b3fcdd9b8bb84b7cacf711a4f [diff] |
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.