Merge master.kernel.org:/pub/scm/linux/kernel/git/willy/parisc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Oct 2006 02:08:13 +0000 (19:08 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Oct 2006 02:08:13 +0000 (19:08 -0700)
* 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


Trivial merge