projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2918cd8 24fc6f0)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 14 Apr 2007 01:20:39 +0000 (18:20 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 14 Apr 2007 01:20:39 +0000 (18:20 -0700)
commitb1847a041aba157bdf1643bd151e98dc44366b1c
tree60240c03d6af4831fc4a202e471ae87a53caaf11tree | snapshot
parent2918cd81f58aa9748acf961240c006394f474047commit | diff
parent24fc6f00b64985773b5abd592c4cb2e30bad7584commit | diff
Merge /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.
John Crispins staging tree