Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c

1 files changed, 1 insertions, 1 deletions

diff --git a/include/net/sock.h b/include/net/sock.h
index c047def9cf10..ded6854e3e4a 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1313,7 +1313,7 @@ static inline int sock_writeable(const struct sock *sk)
 
 static inline gfp_t gfp_any(void)
 {
-        return in_atomic() ? GFP_ATOMIC : GFP_KERNEL;
+        return in_softirq() ? GFP_ATOMIC : GFP_KERNEL;
 }
 
 static inline long sock_rcvtimeo(const struct sock *sk, int noblock)