| commit | b1847a041aba157bdf1643bd151e98dc44366b1c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Apr 13 18:20:39 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Apr 13 18:20:39 2007 -0700 |
| tree | 60240c03d6af4831fc4a202e471ae87a53caaf11 | |
| parent | 2918cd81f58aa9748acf961240c006394f474047 [diff] | |
| parent | 24fc6f00b64985773b5abd592c4cb2e30bad7584 [diff] |
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: [SPARC64]: Fix inline directive in pci_iommu.c [SPARC64]: Fix arg passing to compat_sys_ipc(). [SPARC]: Fix section mismatch warnings in pci.c and pcic.c [SUNRPC]: Make sure on-stack cmsg buffer is properly aligned. [SPARC]: avoid CHILD_MAX and OPEN_MAX constants [SPARC64]: Fix SBUS IOMMU allocation code.