From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 12 Oct 2006 14:37:59 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=83d3d3c52468394419474d053df9dfe60d8f21c2;p=deliverable%2Flinux.git

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC32]: Fix sparc32 modpost warnings.
  [SPARC32]: Fix sparc32 modpost warnings with sunzilog
  [SPARC32]: Mark srmmu_nocache_init as __init.
  [SPARC32]: pcic.c needs asm/irq_regs.h
---

83d3d3c52468394419474d053df9dfe60d8f21c2