Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Jul 2008 01:13:48 +0000 (18:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Jul 2008 01:13:48 +0000 (18:13 -0700)
commita3ad7f128c637b7612ebeacb1f85fec933bb1195
treebbfe3773752cb483c55a4701fa954caf09933049
parent9b79022ca909b66e2cd0cfd9248f832fc165f77f
parent00eabe7c4478f38b42d632763c4878ced5a1f25c
Merge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] qla2xxx: fix msleep compile error