Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/aoe-2.6.git/
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 4 May 2005 14:08:10 +0000 (07:08 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 4 May 2005 14:08:10 +0000 (07:08 -0700)

Trivial merge