From: Linus Torvalds <torvalds@ppc970.osdl.org.(none)>
Date: Tue, 19 Apr 2005 20:12:03 +0000 (-0700)
Subject: Merge with kernel.org:/pub/scm/linux/kernel/git/gregkh/aoe-2.6.git/
X-Git-Tag: v2.6.12-rc3~24
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c3c661932cd53582c5b03692b99649300977248a;p=users%2Fhch%2Fblock.git

Merge with kernel.org:/pub/scm/linux/kernel/git/gregkh/aoe-2.6.git/

for 11 aoe bugfix patches.
---

c3c661932cd53582c5b03692b99649300977248a