From: Dennis Stosberg <dennis@stosberg.net>

This caused the system to stall when the aoe module was loaded.  The error
was introduced in commit 4ca5224f3ea4779054d96e885ca9b3980801ce13

Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/block/aoe/aoeblk.c |    1 +
 1 file changed, 1 insertion(+)

diff -puN drivers/block/aoe/aoeblk.c~aoe-add-forgotten-null-at-end-of-attribute-list-in-aoeblkc drivers/block/aoe/aoeblk.c
--- a/drivers/block/aoe/aoeblk.c~aoe-add-forgotten-null-at-end-of-attribute-list-in-aoeblkc
+++ a/drivers/block/aoe/aoeblk.c
@@ -68,6 +68,7 @@ static struct attribute *aoe_attrs[] = {
 	&disk_attr_mac.attr,
 	&disk_attr_netif.attr,
 	&disk_attr_fwver.attr,
+	NULL
 };
 
 static const struct attribute_group attr_group = {
_