Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 27 Apr 2007 23:21:02 +0000 (16:21 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 27 Apr 2007 23:21:02 +0000 (16:21 -0700)
commit940155309cd037d3a49ad01276e591b872e8a832
tree209d660d00d5e8bb2b74c8e529a8ec4ced411e26
parent42fae7fb1c27d230fbd48aa055a4ae6796fb0039
parente1f2a094bdfa8e7ecc31f048e6c6dbea2b4f5f74
Merge /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.