]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28df955 25f42b6)
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 20 Jun 2006 12:59:45 +0000 (08:59 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 20 Jun 2006 12:59:45 +0000 (08:59 -0400)
1  2 
mm/shmem.c patch | diff1 | diff2 | blob | history

diff --cc mm/shmem.c
Simple merge
Linux kernel for KaRo TX COM modules