tree a0e545bebea11b3ce08147d2e36f2acb1a13de1d
parent 01b09b6c605ed119fba75b82582f017e44dd4a55
parent 62aa0054da220b8bbe6f23c0eb1d97a99005d0b3
author Linus Torvalds <torvalds@linux-foundation.org> 1218158010 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1218158010 -0700

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  xen-blkfront.c: make blkif_ioctl() static
  bio: make use of bvec_nr_vecs
  cciss: fix bug if scsi tape support is disabled
  cciss: add support for multi lun tape devices
  cciss: change the way we notify scsi midlayer of tape drives
  cciss: fix negative logical drive count in procfs
  cciss: remove redundant code
  cciss: make rebuild_lun_table behave better
  cciss: return -EFAULT if copy_from_user() fails