Merge branch 'depends/rmk/restart' into next/cleanup

Conflicts:
	arch/arm/mach-at91/at91cap9.c
	arch/arm/mach-at91/at91sam9260.c
	arch/arm/mach-at91/at91sam9261.c
	arch/arm/mach-at91/at91sam9263.c
	arch/arm/mach-at91/at91sam9g45.c
	arch/arm/mach-at91/at91sam9rl.c
	arch/arm/mach-exynos/cpu.c
	arch/arm/mach-shmobile/board-kota2.c

This resolves a bunch of conflicts between the arm-soc tree
and changes from the arm tree that have gone upstream.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 2 insertions, 4 deletions

diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c
index 7429b47c3aca..381edcd5bc29 100644
--- a/arch/sparc/kernel/ds.c
+++ b/arch/sparc/kernel/ds.c
@@ -1181,13 +1181,11 @@ static int __devinit ds_probe(struct vio_dev *vdev,
 
         dp->rcv_buf_len = 4096;
 
-        dp->ds_states = kzalloc(sizeof(ds_states_template),
-                                GFP_KERNEL);
+        dp->ds_states = kmemdup(ds_states_template,
+                                sizeof(ds_states_template), GFP_KERNEL);
         if (!dp->ds_states)
                 goto out_free_rcv_buf;
 
-        memcpy(dp->ds_states, ds_states_template,
-               sizeof(ds_states_template));
         dp->num_ds_states = ARRAY_SIZE(ds_states_template);
 
         for (i = 0; i < dp->num_ds_states; i++)