[XFS] Fix merge failure
[linux-2.6] / fs / nfsd / vfs.c
2007-10-15  Linus TorvaldsMerge git://git.linux-nfs.org/pub/linux/nfs-2.6
2007-10-15  Linus TorvaldsMerge branch 'v2.6.24-lockdep' of git://git./linux...
2007-10-15  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2007-10-15  Linus TorvaldsMerge git://git./linux/kernel/git/mingo/linux-2.6-sched
2007-10-15  Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2007-10-15  Linus TorvaldsMerge branch 'agp-patches' of /linux/kernel/git/airlied...
2007-10-15  Linus TorvaldsMerge branch 'drm-patches' of ssh:///linux/kernel/git...
2007-10-15  Linus TorvaldsMerge branch 'nfs-server-stable' of git://linux-nfs...
2007-10-13  David WoodhouseMerge Linux 2.6.23
2007-10-13  Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2007-10-10  Len BrownPull bugzilla-8709 into release branch
2007-10-10  Len BrownPull thermal into release branch
2007-10-10  Len BrownPull video into release branch
2007-10-10  Len BrownPull fujitsu-v3 into release branch
2007-10-10  Len BrownPull sony-2.6.24 into release branch
2007-10-09  J. Bruce Fieldsnfsd: remove IS_ISMNDLCK macro
2007-10-09  Pavel EmelyanovCleanup macros for distinguishing mandatory locks
2007-10-09  Christoph Hellwignfsd: fix horrible indentation in nfsd_setattr
2007-09-25  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-09-24  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-09-17  Len BrownPull misc into release branch
2007-09-15  Linus TorvaldsMerge git://git.linux-xtensa.org/kernel/xtensa-feed
2007-09-13  Paul MackerrasMerge branch 'linux-2.6' into for-2.6.24
2007-09-12  Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2007-09-12  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-09-11  Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2007-09-11  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-09-11  Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-rc-fixes-2.6
2007-09-11  David S. MillerMerge /linux/kernel/git/holtmann/bluetooth-2.6
2007-09-11  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2007-09-11  Neil Brownknfsd: Fixed problem with NFS exporting directories...
2007-08-31  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-08-25  Linus TorvaldsMerge branch 'drm-patches' of git://git./linux/kernel...
2007-08-18  Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2007-08-12  Len BrownPull bugzilla-3774 into release branch
2007-08-07  Jeff GarzikMerge branch 'r8169-for-jeff-20070806' of git://electri...
2007-08-07  Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-rc-fixes-2.6
2007-08-03  Linus TorvaldsMerge git://git.infradead.org/battery-2.6
2007-08-02  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2007-08-01  David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2007-08-01  Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2007-08-01  Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2007-08-01  Linus TorvaldsMerge branch 'release' of git://lm-sensors.org/kernel...
2007-07-31  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-07-31  Linus TorvaldsMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2007-07-31  Linus TorvaldsMerge branch 'master' of /linux/kernel/git/davem/sparc-2.6
2007-07-31  Jeff Laytonknfsd: set the response bitmask for NFS4_CREATE_EXCLUSIVE
2007-07-23  David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2007-07-22  Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2007-07-22  Linus TorvaldsMerge branch 'for-linus' of git://git.o-hand.com/linux...
2007-07-22  Linus TorvaldsMerge branch 'for-linus' of git://git.o-hand.com/linux...
2007-07-22  Len BrownPull netlink into release branch
2007-07-22  Len BrownPull osi into release branch
2007-07-22  Len BrownPull video into release branch
2007-07-22  Len BrownPull throttle into release branch
2007-07-22  Len BrownPull misc into release branch
2007-07-22  Len BrownPull dock-bay into release branch
2007-07-22  Len BrownPull bugzilla-7880 into release branch
2007-07-22  Len BrownPull ec into release branch
2007-07-22  Len BrownPull sbs into release branch
2007-07-22  Len BrownPull battery into release branch
2007-07-22  Len BrownPull acpi-debug into release branch
2007-07-22  Len BrownPull acpica into release branch
2007-07-20  Tony LuckPull ia64-clocksource into release branch
2007-07-20  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-07-19  Tony LuckPull vector-domain into release branch
2007-07-19  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-07-19  Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com:8090...
2007-07-19  Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild
2007-07-19  Linus TorvaldsMerge branch 'release' of git://lm-sensors.org/kernel...
2007-07-19  Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2007-07-19  Linus TorvaldsMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2007-07-19  J. Bruce Fieldsknfsd: clean up EX_RDONLY
2007-07-19  J. Bruce Fieldsknfsd: move EX_RDONLY out of header
2007-07-19  J. Bruce Fieldsnfsd: remove unnecessary NULL checks from nfsd_cross_mnt
2007-07-19  J. Bruce Fieldsnfsd: fix possible read-ahead cache and export table...
2007-07-19  Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2007-07-17  Linus TorvaldsMerge branch 'for-linus' of git://git390.osdl.marist...
2007-07-17  Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2007-07-17  Linus TorvaldsMerge branch 'bsg' of git://git.kernel.dk/data/git...
2007-07-17  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-07-17  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-07-17  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2007-07-17  J. Bruce Fieldsknfsd: nfsd4: make readonly access depend on pseudoflavor
2007-07-17  Andy Adamsonknfsd: nfsd4: return nfserr_wrongsec
2007-07-17  J. Bruce Fieldsknfsd: nfsd: factor nfsd_lookup into 2 pieces
2007-07-17  J. Bruce Fieldsknfsd: nfsd: provide export lookup wrappers which take...
2007-07-17  J. Bruce Fieldsknfsd: nfsd: remove superfluous assignment from nfsd_lookup
2007-07-17  J. Bruce Fieldsknfsd: nfsd: make all exp_finding functions return...
2007-07-17  J. Bruce Fieldsknfsd: nfsd4: fix handling of acl errrors
2007-07-17  Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2007-07-17  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2007-07-16  Jeff GarzikMerge branch 'upstream-jgarzik' of git://git./linux...
2007-07-16  Linus TorvaldsMerge branch 'drm-patches' of ssh:///linux/kernel/git...
2007-07-16  Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2007-07-16  Linus TorvaldsMerge /pub/scm/linux/kernel/git/lethal/sh-2.6
2007-07-15  Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2007-07-15  Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com:8090...
2007-07-15  David S. MillerMerge /pub/scm/linux/kernel/git/herbert/crypto-2.6
2007-07-15  David S. MillerMerge branch 'upstream-davem' of /linux/kernel/git...
next