From: Linus Torvalds Date: Wed, 9 Feb 2011 19:45:21 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=aceb91cd351bc3a19a783c901fe8a8070d5f6fa9;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: cdrom: support devices that have check_events but not media_changed cfq-iosched: Don't wait if queue already has requests. blkio-throttle: Avoid calling blkiocg_lookup_group() for root group cfq: rename a function to give it more appropriate name cciss: make cciss_revalidate not loop through CISS_MAX_LUNS volumes unnecessarily. drivers/block/aoe/Makefile: replace the use of -objs with -y loop: queue_lock NULL pointer derefence in blk_throtl_exit drivers/block/Makefile: replace the use of -objs with -y blktrace: Don't output messages if NOTIFY isn't set. --- aceb91cd351bc3a19a783c901fe8a8070d5f6fa9