From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 26 Jul 2006 14:22:36 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.18-rc3~29
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=dab5025ca2f704ea6629121446d62e3043b210e9;p=linux-2.6-omap-h63xx.git

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SCSI] esp: Fix build.
  [SPARC]: Fix SA_STATIC_ALLOC value.
  [SPARC64]: Explicitly print return PC when the kernel fault PC is bogus.
---

dab5025ca2f704ea6629121446d62e3043b210e9