Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Trond Myklebust [Tue, 20 Jun 2006 12:59:45 +0000 (08:59 -0400)]
1  2 
mm/shmem.c

diff --cc mm/shmem.c
Simple merge