Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 12 Oct 2006 14:37:59 +0000 (07:37 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 12 Oct 2006 14:37:59 +0000 (07:37 -0700)
commit83d3d3c52468394419474d053df9dfe60d8f21c2
tree2d69c6c54c591c2732f283baedd374d57eb061fc
parent994bd4f9f5a065ead4a92435fdd928ac7fd33809
parentab5da288ce6a526a0a730362b8c4e03c3a0b58d5
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