From: Linus Torvalds Date: Thu, 6 Nov 2008 23:53:47 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block X-Git-Tag: Ubuntu-5.0.0-8.9~30214 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e252f4db187ef02d06c8551069d944d327b8bb9a;p=mirror_ubuntu-disco-kernel.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: Block: use round_jiffies_up() Add round_jiffies_up and related routines block: fix __blkdev_get() for removable devices generic-ipi: fix the smp_mb() placement blk: move blk_delete_timer call in end_that_request_last block: add timer on blkdev_dequeue_request() not elv_next_request() bio: define __BIOVEC_PHYS_MERGEABLE block: remove unused ll_new_mergeable() --- e252f4db187ef02d06c8551069d944d327b8bb9a