| commit | 6332178d91ca1a9dbd99bd97cabbcf965d178e9f | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Dec 23 17:56:23 2008 -0800 |
| committer | David S. Miller <davem@davemloft.net> | Tue Dec 23 17:56:23 2008 -0800 |
| tree | d98af2cbc7ff0e9e4d00b6cc8c79b05ca7815a5f | |
| parent | 908a7a16b852ffd618a9127be8d62432182d81b4 [diff] | |
| parent | 739840d529eb7505d3cbfe9d468bf1440c9a8e27 [diff] |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/ppp_generic.c