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)
commit9134d02bc0af4a8747d448d1f811ec5f8eb96df6
tree704c3e5dcc10f360815c4868a74711f82fb62e27
parentbbb20089a3275a19e475dbc21320c3742e3ca423
parent80ffb3cceaefa405f2ecd46d66500ed8d53efe74
Merge commit 'md/for-linus' into async-tx-next

Conflicts:
drivers/md/raid5.c
drivers/md/raid5.c
include/linux/pci_ids.h