tree 209d660d00d5e8bb2b74c8e529a8ec4ced411e26
parent 42fae7fb1c27d230fbd48aa055a4ae6796fb0039
parent e1f2a094bdfa8e7ecc31f048e6c6dbea2b4f5f74
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1177716062 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1177716062 -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_scsi.c: Fix compilation.