From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 6 Jul 2006 04:08:35 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: firefly_0821_release~34379
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e2a305ecb5734f24d3a4496605a6fdf27ddf7108;p=firefly-linux-kernel-4.4.55.git

Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix stack overflow checking in modular non-SMP kernels.
  [SPARC64]: Fix sparc64 build errors when CONFIG_PCI=n.
---

e2a305ecb5734f24d3a4496605a6fdf27ddf7108