Merge home.transmeta.com:/home/torvalds/v2.5/alan

into home.transmeta.com:/home/torvalds/v2.5/linux

diff --cc include/asm-i386/pgtable.h
Simple merge

diff --cc include/asm-sh/pgtable.h
Simple merge

diff --cc net/wanrouter/af_wanpipe.c
index cf52004,24ac4cb..5a77024
--- 1/net/wanrouter/af_wanpipe.c
--- 2/net/wanrouter/af_wanpipe.c
+++ b/net/wanrouter/af_wanpipe.c
@@@ -1039,10 -1004,9 +1004,9 @@@ static int wanpipe_release(struct socke
  
        sock->sk = NULL;
        sk->socket = NULL;
 -      sk->dead = 1;
 +      __set_bit(SOCK_DEAD, &sk->flags);
  
        /* Purge queues */
- #ifdef LINUX_2_4
        skb_queue_purge(&sk->receive_queue);
        skb_queue_purge(&sk->write_queue);
        skb_queue_purge(&sk->error_queue);