summaryrefslogtreecommitdiffstats
path: root/drivers/block
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/...Linus Torvalds2010-08-051-13/+51
|\
| * virtio_blk: Remove VBID ioctlRyan Harper2010-08-051-10/+0
| * virtio_blk: Add 'serial' attribute to virtio-blk devices (v2)Ryan Harper2010-08-051-0/+28
| * virtio_blk: support barriers without FLUSH featureChristoph Hellwig2010-08-051-3/+23
* | Merge branch 'upstream/xen' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2010-08-051-0/+30
|\ \ | |/ |/|
| * blkfront: do not create a PV cdrom device if xen_hvm_guestStefano Stabellini2010-07-291-13/+26
| * x86: Unplug emulated disks and nics.Stefano Stabellini2010-07-261-0/+17
* | Merge branch 'master' into for-nextJiri Kosina2010-08-044-5/+10
|\ \ | |/
| * cciss: set SCSI max cmd len to 16, as default is wrongStephen M. Cameron2010-06-151-0/+1
| * cpqarray: fix two more wrong section typeJens Axboe2010-06-141-2/+2
| * cpqarray: fix wrong __init type on pci probe functionJens Axboe2010-06-141-1/+1
| * drbd: Fixed a race between disk-attach and unexpected state changesPhilipp Reisner2010-06-142-2/+6
* | block: cciss: use ARRAY_SIZEKulikov Vasiliy2010-07-201-1/+1
* | update email addressPavel Machek2010-07-191-1/+1
* | fix comment/printk typos concerning "already"Uwe Kleine-König2010-07-111-1/+1
|/
* Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2010-06-048-139/+122
|\
| * Merge branch 'master' into for-linusJens Axboe2010-06-012-8/+7
| |\
| * | cciss: call BUG() earlierDan Carpenter2010-06-011-1/+1
| * | drbd: Reduce verbosityPhilipp Reisner2010-06-012-9/+0
| * | drbd: use drbd specific ratelimit instead of global printk_ratelimitLars Ellenberg2010-06-012-2/+2
| * | drbd: fix hang on local read errors while disconnectedLars Ellenberg2010-06-013-13/+16
| * | drbd: Removed the now empty w_io_error() functionPhilipp Reisner2010-06-013-41/+1
| * | drbd: removed duplicated #includesAndrea Gelmini2010-06-011-1/+0
| * | drbd: improve usage of MSG_MORELars Ellenberg2010-06-011-13/+19
| * | drbd: need to set socket bufsize early to take effectLars Ellenberg2010-06-011-10/+23
| * | drbd: improve network latency, TCP_QUICKACKLars Ellenberg2010-06-011-1/+1
| * | drbd: Revert "drbd: Create new current UUID as late as possible"Philipp Reisner2010-06-013-47/+7
| * | brd: support discardNick Piggin2010-06-011-1/+52
* | | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po...Linus Torvalds2010-06-031-2/+4
|\ \ \
| * | | powerpc/macio: Fix probing of macio devices by using the right of match tableBenjamin Herrenschmidt2010-06-021-2/+4
| | |/ | |/|
* | | virtio-blk: fix minimum number of S/G elementsChristoph Hellwig2010-06-031-1/+3
|/ /
* | Merge remote branch 'origin' into secretlab/next-devicetreeGrant Likely2010-05-2217-480/+1010
|\ \ | |/
| * Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2010-05-211-2/+2
| |\
| | * sanitize vfs_fsync calling conventionsChristoph Hellwig2010-05-211-2/+2
| * | Merge branch 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/...Linus Torvalds2010-05-211-3/+43
| |\ \
| | * | virtio_blk: use virtqueue_xxx wrappersMichael S. Tsirkin2010-05-191-3/+3
| | * | virtio_blk: remove multichar constant.Rusty Russell2010-05-191-1/+1
| | * | Add virtio disk identification ioctljohn cooper2010-05-191-0/+10
| | * | Add virtio disk identification supportjohn cooper2010-05-191-0/+30
| * | | Merge branch 'master' into for-2.6.35Jens Axboe2010-05-216-35/+48
| |\ \ \ | | | |/ | | |/|
| | * | generate "change" uevent for loop deviceDavid Zeuthen2010-05-211-1/+9
| | * | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2010-05-201-2/+1
| | |\ \ | | | |/ | | |/|
| | | * cciss: fix shadows sparse warningBill Pemberton2010-05-111-2/+1
| | * | Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2010-05-181-2/+2
| | |\ \
| | | * \ Merge commit 'v2.6.34-rc6' into core/lockingIngo Molnar2010-05-0338-832/+919
| | | |\ \
| | | * | | i8253: Convert i8253_lock to raw_spinlockThomas Gleixner2010-03-021-2/+2
| | * | | | m68k: amiga - Floppy platform device conversionGeert Uytterhoeven2010-05-171-26/+21
| | * | | | Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-linusJens Axboe2010-05-041-1/+1
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | drbd: don't expose failed local READ to upper layersLars Ellenberg2010-05-031-1/+1
| | * | | | pktcdvd: improve BKL and compat_ioctl.c usageArnd Bergmann2010-04-291-3/+14
| | |/ / /
OpenPOWER on IntegriCloud