From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 14 Apr 2007 01:20:39 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: Ubuntu-5.0.0-8.9~43673
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b1847a041aba157bdf1643bd151e98dc44366b1c;p=mirror_ubuntu-disco-kernel.git

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.
---

b1847a041aba157bdf1643bd151e98dc44366b1c