From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 30 Jun 2007 04:30:18 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.22-rc7~11
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=abdba717253382a669af9c719313ec602cc95a2d;p=~emulex%2Finfiniband.git

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

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Add linux/pagemap.h to asm/tlb.h
  [SPARC64]: Need to set state to IDLE during sun4v IRQ enable.
  [SPARC64]: Fix VIRQ enabling.
  [SPARC64]: Add irqs to mdesc_node.
---

abdba717253382a669af9c719313ec602cc95a2d