Merge commit 'md/for-linus' into async-tx-next
authorDan Williams <dan.j.williams@intel.com>
Wed, 9 Sep 2009 00:55:54 +0000 (17:55 -0700)
committerDan Williams <dan.j.williams@intel.com>
Wed, 9 Sep 2009 00:55:54 +0000 (17:55 -0700)
Conflicts:
drivers/md/raid5.c

1  2 
drivers/md/raid5.c
include/linux/pci_ids.h

Simple merge
Simple merge