Linus Torvalds b4fdcb02f1 Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-block ... * 'for-3.2/core' of git://git.kernel.dk/linux-block: (29 commits) block: don't call blk_drain_queue() if elevator is not up blk-throttle: use queue_is_locked() instead of lockdep_is_held() blk-throttle: Take blkcg->lock while traversing blkcg->policy_list blk-throttle: Free up policy node associated with deleted rule block: warn if tag is greater than real_max_depth. block: make gendisk hold a reference to its queue blk-flush: move the queue kick into blk-flush: fix invalid BUG_ON in blk_insert_flush block: Remove the control of complete cpu from bio. block: fix a typo in the blk-cgroup.h file block: initialize the bounce pool if high memory may be added later block: fix request_queue lifetime handling by making blk_queue_cleanup() properly shutdown block: drop @tsk from attempt_plug_merge() and explain sync rules block: make get_request[_wait]() fail if queue is dead block: reorganize throtl_get_tg() and blk_throtl_bio() block: reorganize queue draining block: drop unnecessary blk_get/put_queue() in scsi_cmd_ioctl() and blk_get_tg() block: pass around REQ_* flags instead of broken down booleans during request alloc/free block: move blk_throtl prototypes to block/blk.h block: fix genhd refcounting in blkio_policy_parse_and_set() ... Fix up trivial conflicts due to "mddev_t" -> "struct mddev" conversion and making the request functions be of type "void" instead of "int" in - drivers/md/{faulty.c,linear.c,md.c,md.h,multipath.c,raid0.c,raid1.c,raid10.c,raid5.c} - drivers/staging/zram/zram_drv.c		2011-11-04 17:06:58 -07:00
..
drbd_actlog.c
drbd_bitmap.c	drbd: Convert vmalloc/memset to vzalloc	2011-09-15 13:55:02 +02:00
drbd_int.h	Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-block	2011-11-04 17:06:58 -07:00
drbd_main.c
drbd_nl.c	Merge branch 'master' into for-next	2011-09-15 15:08:18 +02:00
drbd_proc.c
drbd_receiver.c
drbd_req.c	block: remove support for bio remapping from ->make_request	2011-09-12 12:12:01 +02:00
drbd_req.h
drbd_strings.c
drbd_vli.h
drbd_worker.c
drbd_wrappers.h
Kconfig
Makefile