diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-30 12:43:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-30 12:43:21 -0800 |
| commit | e48b7b66a6531f02f1264c7196f7069a9ce9251a (patch) | |
| tree | d45ce978262e3c32ce8fe460516bb9aae0cc2fb4 /fs/timerfd.c | |
| parent | 5ccf73bb4dc7cc9e1f761202a34de5714164724f (diff) | |
| parent | 9bd3f98821a83041e77ee25158b80b535d02d7b4 (diff) | |
| download | linux-e48b7b66a6531f02f1264c7196f7069a9ce9251a.tar.gz linux-e48b7b66a6531f02f1264c7196f7069a9ce9251a.tar.bz2 linux-e48b7b66a6531f02f1264c7196f7069a9ce9251a.zip | |
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: blk_rq_err_sectors cleanup
block: Honor the gfp_mask for alloc_page() in blkdev_issue_discard()
block: Fix incorrect alignment offset reporting and update documentation
cfq-iosched: don't regard requests with long distance as close
aoe: switch to the new bio_flush_dcache_pages() interface
drivers/block/mg_disk.c: use resource_size()
drivers/block/DAC960.c: use DAC960_V2_Controller
block: Fix topology stacking for data and discard alignment
drbd: remove unused #include <linux/version.h>
drbd: remove duplicated #include
drbd: Fix test of unsigned in _drbd_fault_random()
drbd: Constify struct file_operations
cfq-iosched: Remove prio_change logic for workload selection
cfq-iosched: Get rid of nr_groups
cfq-iosched: Remove the check for same cfq group from allow_merge
drbd: fix test of unsigned in _drbd_fault_random()
block: remove Documentation/block/as-iosched.txt
Diffstat (limited to 'fs/timerfd.c')
0 files changed, 0 insertions, 0 deletions