diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-11 01:29:58 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-11 01:29:58 +0400 |
| commit | 69ca06c9454169c4a9303e8834adae9080f94859 (patch) | |
| tree | d713fe8ac3ada06c0989706e237f6e6176396347 /fs/smbfs/ioctl.c | |
| parent | 9f2d8be4266f8861af806d964ae5db2949b670f3 (diff) | |
| parent | 32f2e807a3938b24d0831211e6094f9e44b2fc83 (diff) | |
| download | linux-69ca06c9454169c4a9303e8834adae9080f94859.tar.xz | |
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: reset oom_cfqq in cfq_set_request()
block: fix sg SG_DXFER_TO_FROM_DEV regression
block: call blk_scsi_ioctl_init()
Fix congestion_wait() sync/async vs read/write confusion
Diffstat (limited to 'fs/smbfs/ioctl.c')
0 files changed, 0 insertions, 0 deletions