tree 529da49b494996ad45930b7ff513612ed8847e8d
parent 4ecbca8554d0f643351ee07d3284138a5e85ba81
parent b2b27757b6f0e88e30f10c431c763523dd7858ca
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1191596888 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1191596888 -0700

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]: Fix 'niu' complex IRQ probing.
  [SPARC64]: check fork_idle() error
  [SPARC64]: Temporary workaround for PCI-E slot on T1000.
  [SPARC64]: VIO device addition log message level is too high.
  [SPARC64]: Fix domain-services port probing.
  [SPARC64]: Don't use in/local regs for ldx/stx data in N1 memcpy.