From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 5 Oct 2006 02:08:13 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/willy/parisc-2.6
X-Git-Tag: v2.6.19-rc1~2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4b8447184ae85de4ce710e5f561fbaada21b8394;p=~emulex%2Finfiniband.git

Merge master.kernel.org:/pub/scm/linux/kernel/git/willy/parisc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/willy/parisc-2.6:
  [PA-RISC] Fix time.c for new do_timer() calling convention
  [PA-RISC] Fix must_check warnings in drivers.c
  [PA-RISC] Fix parisc_newuname()
  [PA-RISC] Remove warning from pci.c
  [PA-RISC] Fix filldir warnings
  [PA-RISC] Fix sys32_sysctl
  [PA-RISC] Fix sba_iommu compilation
---

4b8447184ae85de4ce710e5f561fbaada21b8394