]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
projects / users / dwmw2 / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c973b11 2ad5649)
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>
Wed, 17 Aug 2005 13:37:55 +0000 (14:37 +0100)
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>
Wed, 17 Aug 2005 13:37:55 +0000 (14:37 +0100)
1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
fs/namei.c patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc fs/namei.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.