diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-24 02:56:23 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-24 02:56:23 +0100 |
| commit | 6332178d91ca1a9dbd99bd97cabbcf965d178e9f (patch) | |
| tree | d98af2cbc7ff0e9e4d00b6cc8c79b05ca7815a5f /net/key/af_key.c | |
| parent | net: Remove unused netdev arg from some NAPI interfaces. (diff) | |
| parent | ppp: fix segfaults introduced by netdev_priv changes (diff) | |
| download | linux-6332178d91ca1a9dbd99bd97cabbcf965d178e9f.tar.xz linux-6332178d91ca1a9dbd99bd97cabbcf965d178e9f.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ppp_generic.c
Diffstat (limited to 'net/key/af_key.c')
0 files changed, 0 insertions, 0 deletions