tree e00007494171934393ab500bce506b03777486c0
parent 761a126017e3f001d3f5a574787aa232a9cd5bb5
parent 6bc063d414a815937fc81449fa9ffe8d3a4cdf22
author Linus Torvalds <torvalds@g5.osdl.org> 1153923756 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1153923756 -0700

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SCSI] esp: Fix build.
  [SPARC]: Fix SA_STATIC_ALLOC value.
  [SPARC64]: Explicitly print return PC when the kernel fault PC is bogus.