From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Sep 2008 21:45:42 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.27-rc7~31
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=344a7829c421ce6c626cb94c6576f66a7c28a871;hp=-c;p=safe%2Fjmp%2Flinux-2.6

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.
---

344a7829c421ce6c626cb94c6576f66a7c28a871