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

author Dan Williams <[email protected]>

Wed, 9 Sep 2009 00:55:54 +0000 (17:55 -0700)

committer Dan Williams <[email protected]>

Wed, 9 Sep 2009 00:55:54 +0000 (17:55 -0700)
author Dan Williams <[email protected]>
Wed, 9 Sep 2009 00:55:54 +0000 (17:55 -0700)
committer Dan Williams <[email protected]>
Wed, 9 Sep 2009 00:55:54 +0000 (17:55 -0700)
diff --cc drivers/md/raid5.c
Simple merge
diff --cc include/linux/pci_ids.h
Simple merge
author	Dan Williams <[email protected]>
	Wed, 9 Sep 2009 00:55:54 +0000 (17:55 -0700)
committer	Dan Williams <[email protected]>
	Wed, 9 Sep 2009 00:55:54 +0000 (17:55 -0700)
		1	2
drivers/md/raid5.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/pci_ids.h	patch \|	diff1 \|	diff2 \|	blob \| history