tree 704c3e5dcc10f360815c4868a74711f82fb62e27
parent bbb20089a3275a19e475dbc21320c3742e3ca423
parent 80ffb3cceaefa405f2ecd46d66500ed8d53efe74
author Dan Williams <dan.j.williams@intel.com> 1252457754 -0700
committer Dan Williams <dan.j.williams@intel.com> 1252457754 -0700

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

Conflicts:
	drivers/md/raid5.c