]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 30 Jun 2007 04:30:18 +0000 (21:30 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 30 Jun 2007 04:30:18 +0000 (21:30 -0700)
commitabdba717253382a669af9c719313ec602cc95a2d
tree9368199c0812569f796a6e9d6c3696c2e428f0cf
parent2d408b42ed0a287c64a94b48e24c6bfa95035019
parent9f462a1a5de06503fd247186b91d4205ac1cf1ba
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.