From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 27 Apr 2007 23:21:02 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: kvm-22^2~20
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=940155309cd037d3a49ad01276e591b872e8a832;p=users%2Fdwmw2%2Flinux.git

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.
---

940155309cd037d3a49ad01276e591b872e8a832