tree 8407735b0d569792ec255a2627b533e403d60663
parent 53da1d9456fe7f87a920a78fdbdcf1225d197cb7
parent 0702b30dd821ac8a4103ddbe545518713fdca9be
author Linus Torvalds <torvalds@linux-foundation.org> 1237825524 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1237825524 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Fix crash with /proc/iomem
  sparc64: Reschedule KGDB capture to a software interrupt.
  sbus: Auto-load openprom module when device opened.