| commit | 198d6ba4d7f48c94f990f4604f0b3d73925e0ded | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Nov 18 23:38:23 2008 -0800 |
| committer | David S. Miller <davem@davemloft.net> | Tue Nov 18 23:38:23 2008 -0800 |
| tree | 56bbdf8ba2553c23c8099da9344a8f1d1aba97ab | |
| parent | 9a57f7fabd383920585ed8b74eacd117c6551f2d [diff] | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c [diff] |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/isdn/i4l/isdn_net.c fs/cifs/connect.c