From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 19 Oct 2006 00:51:05 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/aoe-2.6
X-Git-Tag: v2.6.19-rc3~124
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17e6c600b2bc4f15dd5f9144ccb8b5c5211dd6e4;p=linux-2.6

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
---

17e6c600b2bc4f15dd5f9144ccb8b5c5211dd6e4