]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] qla2xxx: fix msleep compile error


Trivial merge