1
0
Files
linux/fs
Linus Torvalds 12e36b2f41 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: (27 commits)
  [CIFS] Missing flags2 for DFS
  [CIFS] Workaround incomplete byte length returned by some
  [CIFS] cifs Kconfig: don't select CONNECTOR
  [CIFS] Level 1 QPathInfo needed for proper OS2 support
  [CIFS] fix typo in previous patch
  [CIFS] Fix old DOS time conversion to handle timezone
  [CIFS] Do not need to adjust for Jan/Feb for leap day
  [CIFS] Fix leaps year calculation for years after 2100
  [CIFS] readdir (ffirst) enablement of accurate timestamps from legacy servers
  [CIFS] Fix compiler warning with previous patch
  [CIFS] Fix typo
  [CIFS] Allow for 15 minute TZs (e.g. Nepal) and be more explicit about
  [CIFS] Fix readdir of large directories for backlevel servers
  [CIFS] Allow LANMAN21 support even in both POSIX non-POSIX path
  [CIFS] Make use of newer QFSInfo dependent on capability bit instead of
  [CIFS] Do not send newer QFSInfo to legacy servers which can not support it
  [CIFS] Fix typo in name of new cifs_show_stats
  [CIFS] Rename server time zone field
  [CIFS] Handle legacy servers which return undefined time zone
  [CIFS] CIFS support for /proc/<pid>/mountstats part 1
  ...

Manual conflict resolution in fs/cifs/connect.c
2006-10-13 08:09:29 -07:00
..
2006-10-11 11:14:23 -07:00
2006-10-10 16:15:33 -07:00
2006-10-03 23:28:36 +02:00
2006-10-09 14:19:08 -07:00
2006-10-11 11:14:21 -07:00
2006-10-11 11:14:21 -07:00
2006-10-11 11:14:19 -07:00
2006-10-11 11:17:06 -07:00
2006-10-10 16:15:34 -07:00
2006-10-11 11:14:23 -07:00
2006-10-02 09:55:27 -05:00
2006-10-11 11:14:23 -07:00
2006-10-03 23:01:26 +02:00
2006-10-11 11:14:23 -07:00
2006-10-11 11:14:23 -07:00
2006-10-05 16:18:55 -07:00
2006-10-10 16:15:34 -07:00
2006-10-03 23:37:55 +02:00
2006-10-04 06:51:26 -06:00
2006-10-11 11:14:25 -07:00
2006-10-11 11:14:21 -07:00
2006-10-02 07:57:15 -07:00
2006-10-10 15:37:23 -07:00
2006-10-01 00:39:33 -07:00
2006-06-26 09:58:17 -07:00
2006-10-01 00:39:19 -07:00
2006-10-01 00:39:29 -07:00
2006-10-01 00:39:19 -07:00
2006-10-09 14:20:38 -07:00