diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-10 02:22:26 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-10 02:22:26 -0700 |
| commit | 65b53e4cc90e59936733b3b95b9451d2ca47528d (patch) | |
| tree | 29932718192962671c48c3fd1ea017a6112459e8 /fs/cifs/AUTHORS | |
| parent | 788c0a53164c05c5ccdb1472474372b72ba74644 (diff) | |
| parent | 2e761e0532a784816e7e822dbaaece8c5d4be14d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tg3.c
drivers/net/wireless/rt2x00/rt2x00dev.c
net/mac80211/ieee80211_i.h
Diffstat (limited to 'fs/cifs/AUTHORS')
| -rw-r--r-- | fs/cifs/AUTHORS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/cifs/AUTHORS b/fs/cifs/AUTHORS index 8848e4dfa02..9c136d7803d 100644 --- a/fs/cifs/AUTHORS +++ b/fs/cifs/AUTHORS @@ -36,6 +36,7 @@ Miklos Szeredi Kazeon team for various fixes especially for 2.4 version. Asser Ferno (Change Notify support) Shaggy (Dave Kleikamp) for inumerable small fs suggestions and some good cleanup +Igor Mammedov (DFS support) Test case and Bug Report contributors ------------------------------------- |