]> git.neil.brown.name Git - history.git/commitdiff
projects / history.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f1695e b7df15e)
Merge davem@nuts.ninka.net:/home/davem/src/BK/net-2.5
authorDavid S. Miller <davem@kernel.bkbits.net>
Sun, 25 May 2003 13:39:33 +0000 (06:39 -0700)
committerDavid S. Miller <davem@kernel.bkbits.net>
Sun, 25 May 2003 13:39:33 +0000 (06:39 -0700)
into kernel.bkbits.net:/home/davem/net-2.5

1  2 
kernel/futex.c patch | diff1 | diff2 | blob | history

diff --cc kernel/futex.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.