Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus

Conflicts:

	include/linux/sunrpc/xprt.h
	net/sunrpc/xprtsock.c
Fix up conflicts with the workqueue changes.

1 files changed, 6 insertions, 2 deletions

diff --git a/include/asm-sh/bugs.h b/include/asm-sh/bugs.h
index beeea40f549e..795047da5e17 100644
--- a/include/asm-sh/bugs.h
+++ b/include/asm-sh/bugs.h
@@ -23,16 +23,20 @@ static void __init check_bugs(void)
         cpu_data->loops_per_jiffy = loops_per_jiffy;
 
         switch (cpu_data->type) {
-        case CPU_SH7604:
+        case CPU_SH7604 ... CPU_SH7619:
                 *p++ = '2';
                 break;
+        case CPU_SH7206:
+                *p++ = '2';
+                *p++ = 'a';
+                break;
         case CPU_SH7705 ... CPU_SH7300:
                 *p++ = '3';
                 break;
         case CPU_SH7750 ... CPU_SH4_501:
                 *p++ = '4';
                 break;
-        case CPU_SH7770 ... CPU_SH7781:
+        case CPU_SH7770 ... CPU_SH7785:
                 *p++ = '4';
                 *p++ = 'a';
                 break;