From: Linus Torvalds Date: Fri, 12 Oct 2007 16:25:42 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7e6973e9aca997d95995a7b17768f7b77b7c6c24;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block * 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block: [BLOCK] s390 xpram typo [BLOCK] Only include the compat ioctl code if CONFIG_BLOCK is set [BLOCK] Better fix for do_blk_trace_setup() for !CONFIG_BLOCK [BLOCK] Move sector_div() from blkdev.h to kernel.h --- 7e6973e9aca997d95995a7b17768f7b77b7c6c24