From: Dan Williams <dan.j.williams@intel.com>
Date: Wed, 9 Sep 2009 00:55:54 +0000 (-0700)
Subject: Merge commit 'md/for-linus' into async-tx-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9134d02bc0af4a8747d448d1f811ec5f8eb96df6;p=linux-beck.git

Merge commit 'md/for-linus' into async-tx-next

Conflicts:
	drivers/md/raid5.c
---

9134d02bc0af4a8747d448d1f811ec5f8eb96df6