Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Feb 2009 17:31:56 +0000 (09:31 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Feb 2009 17:31:56 +0000 (09:31 -0800)
commitf8dacde8c0f7841ad91fbaba43fb0ebf1c2c80b7
treef406bf66a59a1a1a16aab8581b9c8ede1b177540
parent60042600c57be5737cd9d6869e7144f7fe786274
parent1b0e235cc9bfae4bc0f5cd0cba929206fb0f6a64
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Fix crashes in jbusmc_print_dimm()