| commit | 7e6973e9aca997d95995a7b17768f7b77b7c6c24 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Oct 12 09:25:42 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Oct 12 09:25:42 2007 -0700 |
| tree | b4b7904773e8ff55b455599f5bf8674b132ba3d4 | |
| parent | 000233e4d1321e54033d097e98f6868b11614217 [diff] | |
| parent | b018fc09498f73da0014b44acbd59ea4a94300b4 [diff] |
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