aboutsummaryrefslogtreecommitdiffstats
path: root/fs
Commit message (Expand)AuthorAge
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6Linus Torvalds2007-07-18
|\
| * Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6Steve French2007-07-18
| |\
| * | [CIFS] merge conflict in fs/cifs/export.cSteve French2007-07-18
| * | [CIFS] Allow disabling CIFS Unix Extensions as mount optionSteve French2007-07-18
| * | [CIFS] More whitespace/formatting fixes (noticed by checkpatch)Steve French2007-07-17
| * | [CIFS] Typo in previous patchSteve French2007-07-16
| * | [CIFS] zero_user_page() conversionsEric2007-07-16
| * | [CIFS] use simple_prepare_write to zero page dataNate2007-07-16
| * | [CIFS] Fix build break - inet.h not included when experimental ifdef offSteve French2007-07-15
| * | [CIFS] Add support for new POSIX unlinkSteve French2007-07-14
| * | [CIFS] whitespace/formatting fixesSteve French2007-07-12
| * | [CIFS] Fix oops in cifs_create when nfsd server exports cifs mountSteve French2007-07-11
| * | [CIFS] whitespace cleanupSteve French2007-07-09
| * | [CIFS] Fix packet signatures for NTLMv2 caseSteve French2007-07-09
| * | [CIFS] more whitespace fixesSteve French2007-07-08
| * | [CIFS] more whitespace cleanupSteve French2007-07-07
| * | [CIFS] whitespace cleanupSteve French2007-07-06
| * | [CIFS] whitespace cleanupSteve French2007-07-06
| * | [CIFS] ipv6 support no longer experimentalJeff2007-07-06
| * | [CIFS] Mount should fail if server signing off but client mount option requir...Jeff2007-07-06
| * | [CIFS] whitespace fixesSteve French2007-06-28
| * | [CIFS] Fix sign mount option and sign proc config settingSteve French2007-06-28
| * | [CIFS] whitespace cleanupSteve French2007-06-27
| * | [CIFS] Do not allow signals in cifs_demultiplex_threadJeff2007-06-25
| * | [CIFS] fix whitespaceSteve French2007-06-24
| * | [CIFS] Add in some missing flags and cifs README and TODO correctionsSteve French2007-06-24
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6Linus Torvalds2007-07-18
|\ \ \
| * | | sysfs: cosmetic clean up on node creation failure pathsTejun Heo2007-07-18
| * | | sysfs: kill an extra put in sysfs_create_link() failure pathTejun Heo2007-07-18
| * | | sysfs: make sysfs_init_inode() staticTejun Heo2007-07-18
| * | | sysfs: fix sysfs root inode nlink accountingTejun Heo2007-07-18
| * | | sysfs: avoid kmem_cache_free(NULL)Akinobu Mita2007-07-18
| * | | debugfs: remove rmdir() non-empty complaintJens Axboe2007-07-18
| | |/ | |/|
* | | Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2007-07-18
|\ \ \ | |/ / |/| |
| * | locks: fix vfs_test_lock() commentJ. Bruce Fields2007-07-18
| * | locks: make posix_test_lock() interface more consistentJ. Bruce Fields2007-07-18
| * | nfs: disable leases over NFSJ. Bruce Fields2007-07-18
| * | gfs2: stop giving out non-cluster-coherent leasesMarc Eshel2007-07-18
| * | locks: export setlease to filesystemsJ. Bruce Fields2007-07-18
| * | locks: provide a file lease method enabling cluster-coherent leasesJ. Bruce Fields2007-07-18
| * | locks: rename lease functions to reflect locks.c conventionsJ. Bruce Fields2007-07-18
| * | locks: share more common lease codeJ. Bruce Fields2007-07-18
| * | locks: clean up lease_alloc()J. Bruce Fields2007-07-18
| * | locks: convert an -EINVAL return to a BUGJ. Bruce Fields2007-07-18
| * | leases: minor break_lease() comment clarificationdavid m. richter2007-07-18
* | | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tyt...Linus Torvalds2007-07-18
|\ \ \
| * | | ext4: extent macros cleanupDmitry Monakhov2007-07-18
| * | | Fix compilation with EXT_DEBUG, also fix leXX_to_cpu conversions.Dmitry Monakhov2007-07-18
| * | | ext4: remove extra IS_RDONLY() checkDave Hansen2007-07-18
| * | | ext4: Use is_power_of_2()Vignesh Babu2007-07-18