tree bbfe3773752cb483c55a4701fa954caf09933049
parent 9b79022ca909b66e2cd0cfd9248f832fc165f77f
parent 00eabe7c4478f38b42d632763c4878ced5a1f25c
author Linus Torvalds <torvalds@linux-foundation.org> 1217294028 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1217294028 -0700

Merge git://git.kernel.org/pub/scm/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