Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
authorLinus Torvalds <[email protected]>
Wed, 26 Sep 2007 16:08:04 +0000 (09:08 -0700)
committerLinus Torvalds <[email protected]>
Wed, 26 Sep 2007 16:08:04 +0000 (09:08 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] esp: fix instance numbering.


Trivial merge