Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Sep 2008 21:45:42 +0000 (14:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Sep 2008 21:45:42 +0000 (14:45 -0700)
commit344a7829c421ce6c626cb94c6576f66a7c28a871
treefee700ededa9c7962605b611379328aeb0579de1
parent8e82f8c34b1759ae0d80fe96101746ec51fb1ba4
parent7d4ee289d139d27b619c08c9809e7b1088c100aa
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc: Fix user_regset 'n' field values.
  sparc64: Fix PCI error interrupt registry on PSYCHO.
  sparc32: Fix function signature of of_bus_sbus_get_flags().
  sparc64: Fix interrupt register calculations on Psycho and Sabre.