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)
commit4b8447184ae85de4ce710e5f561fbaada21b8394
tree71aed2c654a6d8d83beff480bc84d9e63b366858
parenta43cdf08a1b1ab3c013059b5fa4c1b7561e53cb7
parent1604f31895dcdb42edf6511ce7ef0546ff92c8e5
Merge /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