diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-18 17:51:05 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-18 17:51:05 -0700 |
commit | 17e6c600b2bc4f15dd5f9144ccb8b5c5211dd6e4 (patch) | |
tree | 59e6b08c8a9ca24a5de36adb91ddc4cef8c63ed7 /arch/cris | |
parent | b6aefcce747b3bc54d701d3c329416d0c9616f10 (diff) | |
parent | 4ca5224f3ea4779054d96e885ca9b3980801ce13 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/aoe-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/aoe-2.6:
aoe: fix sysfs_create_file warnings
aoe: revert printk macros
aoe: update driver version
aoe: remove sysfs comment
aoe: use bio->bi_idx
aoe: module parameter for device timeout
aoe: zero copy write 2 of 2
aoe: improve retransmission heuristics
aoe: jumbo frame support 2 of 2
aoe: clean up printks via macros
aoe: jumbo frame support 1 of 2
aoe: zero copy write 1 of 2
aoe: remove unused NARGS enum
aoe: update copyright date
aoe: eliminate isbusy message
Diffstat (limited to 'arch/cris')
0 files changed, 0 insertions, 0 deletions