Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/ath9k/core.c
	drivers/net/wireless/ath9k/main.c
	net/core/dev.c

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c
index bd578cc4856d..10306e476e38 100644
--- a/arch/sparc64/kernel/ptrace.c
+++ b/arch/sparc64/kernel/ptrace.c
@@ -443,7 +443,7 @@ static const struct user_regset sparc64_regsets[] = {
          */
         [REGSET_GENERAL] = {
                 .core_note_type = NT_PRSTATUS,
-                .n = 36 * sizeof(u64),
+                .n = 36,
                 .size = sizeof(u64), .align = sizeof(u64),
                 .get = genregs64_get, .set = genregs64_set
         },
@@ -455,7 +455,7 @@ static const struct user_regset sparc64_regsets[] = {
          */
         [REGSET_FP] = {
                 .core_note_type = NT_PRFPREG,
-                .n = 35 * sizeof(u64),
+                .n = 35,
                 .size = sizeof(u64), .align = sizeof(u64),
                 .get = fpregs64_get, .set = fpregs64_set
         },
@@ -801,7 +801,7 @@ static const struct user_regset sparc32_regsets[] = {
          */
         [REGSET_GENERAL] = {
                 .core_note_type = NT_PRSTATUS,
-                .n = 38 * sizeof(u32),
+                .n = 38,
                 .size = sizeof(u32), .align = sizeof(u32),
                 .get = genregs32_get, .set = genregs32_set
         },
@@ -817,7 +817,7 @@ static const struct user_regset sparc32_regsets[] = {
          */
         [REGSET_FP] = {
                 .core_note_type = NT_PRFPREG,
-                .n = 99 * sizeof(u32),
+                .n = 99,
                 .size = sizeof(u32), .align = sizeof(u32),
                 .get = fpregs32_get, .set = fpregs32_set
         },