---

yaml --- r: 6602 b: refs/heads/master c: 136df52 h: refs/heads/master v: v3
git-mirror · Aug 25, 2005 · c2e66ca · c2e66ca
1 parent 010e826
commit c2e66ca
Show file tree

Hide file tree

Showing 272 changed files with 6,282 additions and 16,744 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8aaf226a8eaa0823c4f3c58d5207004ff6e3e758
+refs/heads/master: 136df52d532af9c19e5cd0e43a54ea4ee2d934fc
diff --git a/trunk/Documentation/networking/phy.txt b/trunk/Documentation/networking/phy.txt
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -2092,12 +2092,6 @@ M:	support@simtec.co.uk
 W:	http://www.simtec.co.uk/products/EB2410ITX/
 S:	Supported
 
-SIS 190 ETHERNET DRIVER
-P:	Francois Romieu
-M:	romieu@fr.zoreil.com
-L:	netdev@vger.kernel.org
-S:	Maintained
-
 SIS 5513 IDE CONTROLLER DRIVER
 P:	Lionel Bouton
 M:	Lionel.Bouton@inet6.fr

diff --git a/trunk/Makefile b/trunk/Makefile
@@ -1,8 +1,8 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 13
-EXTRAVERSION =
-NAME=Affluent Albatross
+EXTRAVERSION =-rc7
+NAME=Woozy Numbat
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"

diff --git a/trunk/arch/alpha/kernel/signal.c b/trunk/arch/alpha/kernel/signal.c
@@ -566,12 +566,13 @@ handle_signal(int sig, struct k_sigaction *ka, siginfo_t *info,
 	if (ka->sa.sa_flags & SA_RESETHAND)
 		ka->sa.sa_handler = SIG_DFL;
 
-	spin_lock_irq(&current->sighand->siglock);
-	sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
-	if (!(ka->sa.sa_flags & SA_NODEFER)) 
+	if (!(ka->sa.sa_flags & SA_NODEFER)) {
+		spin_lock_irq(&current->sighand->siglock);
+		sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
 		sigaddset(&current->blocked,sig);
-	recalc_sigpending();
-	spin_unlock_irq(&current->sighand->siglock);
+		recalc_sigpending();
+		spin_unlock_irq(&current->sighand->siglock);
+	}
 }
 
 static inline void