| commit | 999646e3f953c734f8eced551fc1ea28719ba7a7 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 10 Apr 2008 20:39:07 +0000 (10 13:39 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 10 Apr 2008 20:39:07 +0000 (10 13:39 -0700) | ||
| tree | 303e37c8a848534331640d7a5c7fd177537534b1 | treesnapshot (tar.gz zip) |
| parent | 76b0c26af2736b7e5b87e6ed7ab63901483d5736 | commitdiff |
| parent | 4faa3c8150c1d4f7b38d962eda7851083e218e3f | commitdiff |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
cfq-iosched: do not leak ioc_data across iosched switches
splice: fix infinite loop in generic_file_splice_read()
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
cfq-iosched: do not leak ioc_data across iosched switches
splice: fix infinite loop in generic_file_splice_read()