]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d087e4b 0f36b01)
Merge branch 'master' of /usr/src/ntfs-2.6/
authorAnton Altaparmakov <aia21@cantab.net>
Thu, 19 Jan 2006 16:39:33 +0000 (16:39 +0000)
committerAnton Altaparmakov <aia21@cantab.net>
Thu, 19 Jan 2006 16:39:33 +0000 (16:39 +0000)
1  2 
fs/ntfs/file.c patch | diff1 | diff2 | blob | history

diff --cc fs/ntfs/file.c
Simple merge
Linux 2.6 source tree