Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd

Conflicts:
	drivers/mtd/nand/nand_base.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
index 2783f69dada6..f8d22872d753 100644
--- a/drivers/firewire/core-cdev.c
+++ b/drivers/firewire/core-cdev.c
@@ -473,8 +473,8 @@ static int ioctl_get_info(struct client *client, union ioctl_arg *arg)
         client->bus_reset_closure = a->bus_reset_closure;
         if (a->bus_reset != 0) {
                 fill_bus_reset_event(&bus_reset, client);
-                ret = copy_to_user(u64_to_uptr(a->bus_reset),
-                                   &bus_reset, sizeof(bus_reset));
+                /* unaligned size of bus_reset is 36 bytes */
+                ret = copy_to_user(u64_to_uptr(a->bus_reset), &bus_reset, 36);
         }
         if (ret == 0 && list_empty(&client->link))
                 list_add_tail(&client->link, &client->device->client_list);